From 52306efb20206afdf2c859d5a210df00392abea1 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 25 Apr 2024 15:15:08 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/src/debug/res/xml/network_security_config.xml      |  4 ++--
 app/src/external/res/xml/network_security_config.xml   |  5 +++--
 app/src/internal/res/xml/network_security_config.xml   |  4 ++--
 app/src/main/res/xml/network_security_config.xml       |  7 ++-----
 .../connection/RealInternetConnectionManager.kt        | 10 +++++++++-
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/src/debug/res/xml/network_security_config.xml b/app/src/debug/res/xml/network_security_config.xml
index 894912ac61..52c44ac992 100644
--- a/app/src/debug/res/xml/network_security_config.xml
+++ b/app/src/debug/res/xml/network_security_config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <base-config cleartextTrafficPermitted="true">
+    <base-config cleartextTrafficPermitted="false">
         <trust-anchors>
-            <certificates src="user" />
             <certificates src="system" />
+            <certificates src="user" />
         </trust-anchors>
     </base-config>
 </network-security-config>
diff --git a/app/src/external/res/xml/network_security_config.xml b/app/src/external/res/xml/network_security_config.xml
index 894912ac61..d49c0f70ba 100644
--- a/app/src/external/res/xml/network_security_config.xml
+++ b/app/src/external/res/xml/network_security_config.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <base-config cleartextTrafficPermitted="true">
+    <base-config cleartextTrafficPermitted="false">
         <trust-anchors>
-            <certificates src="user" />
             <certificates src="system" />
+            <certificates src="user" />
         </trust-anchors>
     </base-config>
 </network-security-config>
+
diff --git a/app/src/internal/res/xml/network_security_config.xml b/app/src/internal/res/xml/network_security_config.xml
index 894912ac61..52c44ac992 100644
--- a/app/src/internal/res/xml/network_security_config.xml
+++ b/app/src/internal/res/xml/network_security_config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <base-config cleartextTrafficPermitted="true">
+    <base-config cleartextTrafficPermitted="false">
         <trust-anchors>
-            <certificates src="user" />
             <certificates src="system" />
+            <certificates src="user" />
         </trust-anchors>
     </base-config>
 </network-security-config>
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index 22e9f8653e..683208ffda 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <base-config cleartextTrafficPermitted="true" />
-    <domain-config>
-        <domain includeSubdomains="true">api.tangem.com</domain>
+    <base-config cleartextTrafficPermitted="false">
         <trust-anchors>
-            <certificates src="user" />
             <certificates src="system" />
         </trust-anchors>
-    </domain-config>
+    </base-config>
 </network-security-config>
diff --git a/core/datasource/src/main/java/com/tangem/datasource/connection/RealInternetConnectionManager.kt b/core/datasource/src/main/java/com/tangem/datasource/connection/RealInternetConnectionManager.kt
index 8ca86a2587..7a3279d188 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/connection/RealInternetConnectionManager.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/connection/RealInternetConnectionManager.kt
@@ -13,6 +13,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.reactive.asFlow
 
+private const val PING_SERVER = "https://clients3.google.com/generate_204"
 private const val PING_INTERVAL = 5_000
 
 internal class RealInternetConnectionManager : NetworkConnectionManager {
@@ -24,7 +25,12 @@ internal class RealInternetConnectionManager : NetworkConnectionManager {
 
     private val initialNetworkResult: Boolean by lazy {
         ReactiveNetwork
-            .checkInternetConnectivity()
+            .checkInternetConnectivity(
+                InternetObservingSettings.builder()
+                    .host(PING_SERVER)
+                    .port(443)
+                    .build(),
+            )
             .subscribeOn(Schedulers.io())
             .observeOn(Schedulers.io())
             .blockingGet()
@@ -33,6 +39,8 @@ internal class RealInternetConnectionManager : NetworkConnectionManager {
     override val isOnlineFlow: StateFlow<Boolean> = ReactiveNetwork
         .observeInternetConnectivity(
             InternetObservingSettings.builder()
+                .host(PING_SERVER)
+                .port(443)
                 .interval(PING_INTERVAL)
                 .build(),
         )