From 8debeb357dc8acd1c6eeea1e7813d9bca4efeb58 Mon Sep 17 00:00:00 2001
From: Szymon Piwowarczyk <szymon@piwowarczyk.net>
Date: Fri, 18 Oct 2024 08:31:42 +0200
Subject: [PATCH] fix(#23,#24) Network security config to allow http traffic

---
 android/app/build.gradle                      |  4 +--
 android/app/src/main/AndroidManifest.xml      |  3 +-
 .../main/res/xml/network_security_config.xml  | 33 ++++++++++---------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 25919d2..3ae4033 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -82,8 +82,8 @@ android {
         applicationId "com.frigateviewer"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 17
-        versionName "14.2.2"
+        versionCode 18
+        versionName "14.2.3"
     }
     signingConfigs {
         debug {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 43966f6..69256ad 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
     android:label="@string/app_name"
     android:icon="@mipmap/ic_launcher"
     android:allowBackup="false"
-    android:theme="@style/AppTheme">
+    android:theme="@style/AppTheme"
+    android:networkSecurityConfig="@xml/network_seecurity_config">
     <activity
       android:name=".MainActivity"
       android:label="@string/app_name"
diff --git a/android/app/src/main/res/xml/network_security_config.xml b/android/app/src/main/res/xml/network_security_config.xml
index f090b40..255a3c7 100644
--- a/android/app/src/main/res/xml/network_security_config.xml
+++ b/android/app/src/main/res/xml/network_security_config.xml
@@ -1,17 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <domain-config>
-        <!-- Localhost config is NEEDED from react-native for the bundling to work  -->
-        <domain-config cleartextTrafficPermitted="true">
-            <domain includeSubdomains="true">127.0.0.1</domain>
-            <domain includeSubdomains="true">10.0.0.1</domain>
-            <domain includeSubdomains="true">localhost</domain>
-        </domain-config>
-
-        <domain includeSubdomains="true">my.domain.com</domain>
-        <trust-anchors>
-            <certificates src="user"/>
-            <certificates src="system"/>
-        </trust-anchors>
-    </domain-config>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config>
+        <!-- Localhost config is NEEDED from react-native for the bundling to work  -->
+        <domain-config cleartextTrafficPermitted="true">
+            <domain includeSubdomains="true">127.0.0.1</domain>
+            <domain includeSubdomains="true">10.0.0.1</domain>
+            <domain includeSubdomains="true">localhost</domain>
+        </domain-config>
+
+        <base-config cleartextTrafficPermitted="true">
+            <trust-anchors>
+                <certificates src="user" />
+                <certificates src="system" />
+            </trust-anchors>
+        </base-config>
+    </domain-config>
 </network-security-config>
\ No newline at end of file