From ccfa68c53045dfc1a7071d282da477a3ec6c9f60 Mon Sep 17 00:00:00 2001
From: Lei Nelissen <lei@codified.nl>
Date: Tue, 10 Jan 2023 22:35:02 +0100
Subject: [PATCH] fix: allow user-supplied CA certificates on Android fixes
 #110

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

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 2d689f1..528ac4b 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application
-        android:usesCleartextTraffic="true"
+        android:networkSecurityConfig="@xml/react_native_config"
         tools:targetApi="28"
         tools:ignore="GoogleAppIndexingWarning">
             <activity
diff --git a/android/app/src/debug/res/xml/react_native_config.xml b/android/app/src/debug/res/xml/react_native_config.xml
new file mode 100644
index 0000000..65aa674
--- /dev/null
+++ b/android/app/src/debug/res/xml/react_native_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="user"/>
+            <certificates src="system"/>
+        </trust-anchors>
+    </base-config>
+</network-security-config>
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 9465bfe..1ac8300 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
-      android:usesCleartextTraffic="true"
+      android:networkSecurityConfig="@xml/react_native_config"
       android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"
diff --git a/android/app/src/main/res/xml/react_native_config.xml b/android/app/src/main/res/xml/react_native_config.xml
new file mode 100644
index 0000000..65aa674
--- /dev/null
+++ b/android/app/src/main/res/xml/react_native_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="user"/>
+            <certificates src="system"/>
+        </trust-anchors>
+    </base-config>
+</network-security-config>
\ No newline at end of file