From dae7a80b725f40f1f7e7b0759e9863e431f0a507 Mon Sep 17 00:00:00 2001
From: Dulmandakh <dulmandakh@gmail.com>
Date: Wed, 13 Feb 2019 21:18:31 +0800
Subject: [PATCH 1/2] improve android network security config

---
 template/android/app/src/debug/AndroidManifest.xml        | 5 +++++
 .../res/{xml => xml-v24}/network_security_config.xml      | 0
 template/android/app/src/main/AndroidManifest.xml         | 5 +----
 .../app/src/release/res/xml/network_security_config.xml   | 8 --------
 4 files changed, 6 insertions(+), 12 deletions(-)
 create mode 100644 template/android/app/src/debug/AndroidManifest.xml
 rename template/android/app/src/debug/res/{xml => xml-v24}/network_security_config.xml (100%)
 delete mode 100644 template/android/app/src/release/res/xml/network_security_config.xml

diff --git a/template/android/app/src/debug/AndroidManifest.xml b/template/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 00000000000000..f3bc056c8f2938
--- /dev/null
+++ b/template/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <application tools:targetApi="24" tools:ignore="GoogleAppIndexingWarning" android:networkSecurityConfig="@xml/network_security_config" />
+</manifest>
\ No newline at end of file
diff --git a/template/android/app/src/debug/res/xml/network_security_config.xml b/template/android/app/src/debug/res/xml-v24/network_security_config.xml
similarity index 100%
rename from template/android/app/src/debug/res/xml/network_security_config.xml
rename to template/android/app/src/debug/res/xml-v24/network_security_config.xml
diff --git a/template/android/app/src/main/AndroidManifest.xml b/template/android/app/src/main/AndroidManifest.xml
index 1b0c20ef328804..e5e6330fbdf64d 100644
--- a/template/android/app/src/main/AndroidManifest.xml
+++ b/template/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
   package="com.helloworld">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -11,9 +10,7 @@
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
-      android:theme="@style/AppTheme"
-      android:networkSecurityConfig="@xml/network_security_config"
-      tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+      android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
diff --git a/template/android/app/src/release/res/xml/network_security_config.xml b/template/android/app/src/release/res/xml/network_security_config.xml
deleted file mode 100644
index b3917ffe5b8072..00000000000000
--- a/template/android/app/src/release/res/xml/network_security_config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-  <domain-config cleartextTrafficPermitted="false">
-    <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>

From 4908b5f1af0289be59277206b4a0bdc68cca10ca Mon Sep 17 00:00:00 2001
From: Dulmandakh <dulmandakh@gmail.com>
Date: Wed, 13 Feb 2019 21:37:47 +0800
Subject: [PATCH 2/2] descriptive name for network security config:
 react_native_config.xml

---
 template/android/app/src/debug/AndroidManifest.xml              | 2 +-
 .../react_native_config.xml}                                    | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename template/android/app/src/debug/res/{xml-v24/network_security_config.xml => xml-v28/react_native_config.xml} (100%)

diff --git a/template/android/app/src/debug/AndroidManifest.xml b/template/android/app/src/debug/AndroidManifest.xml
index f3bc056c8f2938..1fce564881ff37 100644
--- a/template/android/app/src/debug/AndroidManifest.xml
+++ b/template/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
-    <application tools:targetApi="24" tools:ignore="GoogleAppIndexingWarning" android:networkSecurityConfig="@xml/network_security_config" />
+    <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:networkSecurityConfig="@xml/react_native_config" />
 </manifest>
\ No newline at end of file
diff --git a/template/android/app/src/debug/res/xml-v24/network_security_config.xml b/template/android/app/src/debug/res/xml-v28/react_native_config.xml
similarity index 100%
rename from template/android/app/src/debug/res/xml-v24/network_security_config.xml
rename to template/android/app/src/debug/res/xml-v28/react_native_config.xml