From 3fc47e1ddfb8fb672063a320e97b4b171e007c28 Mon Sep 17 00:00:00 2001
From: Gabe Rogan <gabe@futo.org>
Date: Mon, 11 Dec 2023 13:37:59 -0500
Subject: [PATCH 1/2] Improve error message during development

---
 app/src/main/assets/devportal/dev_bridge.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/assets/devportal/dev_bridge.js b/app/src/main/assets/devportal/dev_bridge.js
index 8186c8ae..3f730c0a 100644
--- a/app/src/main/assets/devportal/dev_bridge.js
+++ b/app/src/main/assets/devportal/dev_bridge.js
@@ -42,7 +42,7 @@ class RemoteObject {
                         return remoteCall(me.__id, methodName, Array.from(arguments));
                     }
                     catch(ex) {
-                        if(ex.indexOf("[400]") > 0 && ex.indexOf("does not exist") > 0 && ex.indexOf(me.__id) > 0) {
+                        if(ex.indexOf && ex.indexOf("[400]") > 0 && ex.indexOf("does not exist") > 0 && ex.indexOf(me.__id) > 0) {
                             deletePackage(me.__id);
                         }
                         else throw ex;
@@ -61,7 +61,7 @@ class RemoteObject {
                             return remoteProp(me.__id, propName);
                         }
                         catch(ex) {
-                            if(ex.indexOf("[400]") > 0 && ex.indexOf("does not exist") > 0 && ex.indexOf(me.__id) > 0) {
+                            if(ex.indexOf && ex.indexOf("[400]") > 0 && ex.indexOf("does not exist") > 0 && ex.indexOf(me.__id) > 0) {
                                 deletePackage(me.__id);
                             }
                             else throw ex;

From deefec6f5aa6507176566353513bdfea774fb335 Mon Sep 17 00:00:00 2001
From: Gabe Rogan <gabe@futo.org>
Date: Mon, 11 Dec 2023 13:38:13 -0500
Subject: [PATCH 2/2] Allow proxies to intercept traffic

---
 app/src/unstable/AndroidManifest.xml            |  2 +-
 .../res/xml/network_security_config.xml         | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 app/src/unstable/res/xml/network_security_config.xml

diff --git a/app/src/unstable/AndroidManifest.xml b/app/src/unstable/AndroidManifest.xml
index 0f4a00b8..8a600a38 100644
--- a/app/src/unstable/AndroidManifest.xml
+++ b/app/src/unstable/AndroidManifest.xml
@@ -4,7 +4,7 @@
 
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
-    <application>
+    <application android:networkSecurityConfig="@xml/network_security_config">
         <receiver android:name=".receivers.InstallReceiver" />
 
         <activity android:name=".activities.MainActivity">
diff --git a/app/src/unstable/res/xml/network_security_config.xml b/app/src/unstable/res/xml/network_security_config.xml
new file mode 100644
index 00000000..84da531b
--- /dev/null
+++ b/app/src/unstable/res/xml/network_security_config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <debug-overrides>
+        <trust-anchors>
+            <!-- Trust user added CAs while debuggable only -->
+            <certificates src="user" />
+            <certificates src="system" />
+        </trust-anchors>
+    </debug-overrides>
+
+    <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