From dedd9a552f6900dbd77eace122b01e0b13236dd6 Mon Sep 17 00:00:00 2001 From: Salakar Date: Thu, 24 Jan 2019 01:35:54 +0000 Subject: [PATCH 1/8] prefix network security config xml with 'rn' (to match preferences) --- ...network_security_config.xml => rn_network_security_config.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ReactAndroid/src/main/res/devsupport/xml/{network_security_config.xml => rn_network_security_config.xml} (100%) diff --git a/ReactAndroid/src/main/res/devsupport/xml/network_security_config.xml b/ReactAndroid/src/main/res/devsupport/xml/rn_network_security_config.xml similarity index 100% rename from ReactAndroid/src/main/res/devsupport/xml/network_security_config.xml rename to ReactAndroid/src/main/res/devsupport/xml/rn_network_security_config.xml From a89e8781d9fe6dedc4eb420ff876760dd70751a8 Mon Sep 17 00:00:00 2001 From: Salakar Date: Thu, 24 Jan 2019 01:36:23 +0000 Subject: [PATCH 2/8] apply networkSecurityConfig to androidTest --- ReactAndroid/src/androidTest/AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/src/androidTest/AndroidManifest.xml b/ReactAndroid/src/androidTest/AndroidManifest.xml index 62c744e8f895bf..26c5eb78702326 100644 --- a/ReactAndroid/src/androidTest/AndroidManifest.xml +++ b/ReactAndroid/src/androidTest/AndroidManifest.xml @@ -8,7 +8,8 @@ + android:hardwareAccelerated="false" + android:networkSecurityConfig="@xml/rn_network_security_config"> Date: Thu, 24 Jan 2019 01:37:22 +0000 Subject: [PATCH 3/8] apply networkSecurityConfig to debug --- ReactAndroid/src/debug/AndroidManifest.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 ReactAndroid/src/debug/AndroidManifest.xml diff --git a/ReactAndroid/src/debug/AndroidManifest.xml b/ReactAndroid/src/debug/AndroidManifest.xml new file mode 100644 index 00000000000000..3daa18a5edac03 --- /dev/null +++ b/ReactAndroid/src/debug/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + + + From 57c3f7719e4729f04f606dd177eb02316844fff4 Mon Sep 17 00:00:00 2001 From: Salakar Date: Fri, 1 Feb 2019 12:31:54 +0000 Subject: [PATCH 4/8] apply network security config to template project --- .../app/src/debug/res/xml/network_security_config.xml | 8 ++++++++ template/android/app/src/main/AndroidManifest.xml | 7 +++++-- .../app/src/release/res/xml/network_security_config.xml | 8 ++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 template/android/app/src/debug/res/xml/network_security_config.xml create mode 100644 template/android/app/src/release/res/xml/network_security_config.xml diff --git a/template/android/app/src/debug/res/xml/network_security_config.xml b/template/android/app/src/debug/res/xml/network_security_config.xml new file mode 100644 index 00000000000000..ba4b23070be6cc --- /dev/null +++ b/template/android/app/src/debug/res/xml/network_security_config.xml @@ -0,0 +1,8 @@ + + + + localhost + 10.0.2.2 + 10.0.3.2 + + diff --git a/template/android/app/src/main/AndroidManifest.xml b/template/android/app/src/main/AndroidManifest.xml index a6eda6784a2950..1b0c20ef328804 100644 --- a/template/android/app/src/main/AndroidManifest.xml +++ b/template/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools" + package="com.helloworld"> @@ -10,7 +11,9 @@ android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + android:networkSecurityConfig="@xml/network_security_config" + tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"> + + + localhost + 10.0.2.2 + 10.0.3.2 + + From d1c60cac0c3eb710ea1eb9085c106e9da87a9e0d Mon Sep 17 00:00:00 2001 From: Salakar Date: Fri, 1 Feb 2019 12:34:34 +0000 Subject: [PATCH 5/8] Revert "apply networkSecurityConfig to debug" This reverts commit 1f15078 --- ReactAndroid/src/debug/AndroidManifest.xml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 ReactAndroid/src/debug/AndroidManifest.xml diff --git a/ReactAndroid/src/debug/AndroidManifest.xml b/ReactAndroid/src/debug/AndroidManifest.xml deleted file mode 100644 index 3daa18a5edac03..00000000000000 --- a/ReactAndroid/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - From 004bb92601a349e04dacd799dafbbb756fc66de1 Mon Sep 17 00:00:00 2001 From: Salakar Date: Fri, 1 Feb 2019 12:34:40 +0000 Subject: [PATCH 6/8] Revert "apply networkSecurityConfig to androidTest" This reverts commit a89e878 --- ReactAndroid/src/androidTest/AndroidManifest.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ReactAndroid/src/androidTest/AndroidManifest.xml b/ReactAndroid/src/androidTest/AndroidManifest.xml index 26c5eb78702326..62c744e8f895bf 100644 --- a/ReactAndroid/src/androidTest/AndroidManifest.xml +++ b/ReactAndroid/src/androidTest/AndroidManifest.xml @@ -8,8 +8,7 @@ + android:hardwareAccelerated="false"> Date: Fri, 1 Feb 2019 12:34:45 +0000 Subject: [PATCH 7/8] Revert "prefix network security config xml with 'rn' (to match preferences)" This reverts commit dedd9a5 --- ...rn_network_security_config.xml => network_security_config.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ReactAndroid/src/main/res/devsupport/xml/{rn_network_security_config.xml => network_security_config.xml} (100%) diff --git a/ReactAndroid/src/main/res/devsupport/xml/rn_network_security_config.xml b/ReactAndroid/src/main/res/devsupport/xml/network_security_config.xml similarity index 100% rename from ReactAndroid/src/main/res/devsupport/xml/rn_network_security_config.xml rename to ReactAndroid/src/main/res/devsupport/xml/network_security_config.xml From 3df598af047ee78237a852ae2f7fd71fdaf5deb6 Mon Sep 17 00:00:00 2001 From: Salakar Date: Fri, 1 Feb 2019 12:58:30 +0000 Subject: [PATCH 8/8] Revert "Add Network Security Config file (fixes #22375) (#23105)" This reverts commit 9f14ac2 --- .../main/res/devsupport/xml/network_security_config.xml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 ReactAndroid/src/main/res/devsupport/xml/network_security_config.xml diff --git a/ReactAndroid/src/main/res/devsupport/xml/network_security_config.xml b/ReactAndroid/src/main/res/devsupport/xml/network_security_config.xml deleted file mode 100644 index ba4b23070be6cc..00000000000000 --- a/ReactAndroid/src/main/res/devsupport/xml/network_security_config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - localhost - 10.0.2.2 - 10.0.3.2 - -