From 05ef9f7d7343d71dd9f387c51c262de8b7e9f539 Mon Sep 17 00:00:00 2001
From: Djorkaeff Alexandre <djorkaeff.unb@gmail.com>
Date: Wed, 16 Oct 2019 17:12:13 -0300
Subject: [PATCH] [FIX] Allow self-signed certificates (#1310)

---
 android/app/src/debug/AndroidManifest.xml                | 2 +-
 android/app/src/debug/res/xml/react_native_config.xml    | 8 --------
 android/app/src/main/AndroidManifest.xml                 | 1 +
 android/app/src/main/res/xml/network_security_config.xml | 9 +++++++++
 4 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 android/app/src/debug/res/xml/react_native_config.xml
 create mode 100644 android/app/src/main/res/xml/network_security_config.xml

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 4ea9bc049..5cf3292c2 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -4,5 +4,5 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:networkSecurityConfig="@xml/react_native_config" />
+    <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
 </manifest>
\ No newline at end of file
diff --git a/android/app/src/debug/res/xml/react_native_config.xml b/android/app/src/debug/res/xml/react_native_config.xml
deleted file mode 100644
index ba4b23070..000000000
--- a/android/app/src/debug/res/xml/react_native_config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-  <domain-config cleartextTrafficPermitted="true">
-    <domain includeSubdomains="false">localhost</domain>
-    <domain includeSubdomains="false">10.0.2.2</domain>
-    <domain includeSubdomains="false">10.0.3.2</domain>
-  </domain-config>
-</network-security-config>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index cf2faf448..e4e2ec403 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -17,6 +17,7 @@
 		android:label="@string/app_name"
 		android:icon="@mipmap/ic_launcher"
 		android:theme="@style/AppTheme"
+		android:networkSecurityConfig="@xml/network_security_config"
 	>
 		<activity
 			android:name=".MainActivity"
diff --git a/android/app/src/main/res/xml/network_security_config.xml b/android/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 000000000..bb6ab93df
--- /dev/null
+++ b/android/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
\ No newline at end of file