Merge pull request #22 from futuredapp/feature/charles-proxy

futuredapp · Feb 7, 2025 · aea267f · aea267f
2 parents 265372b + d8f1f3e
commit aea267f
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -40,6 +40,10 @@ This project complies with ~~Standard (F0), High (F1), Highest (F2)~~ security s
 
 ~~[Project specific standard](www.notion.so)~~
 
+#### Charles Proxy
+
+[Charles Proxy](https://www.charlesproxy.com/documentation/welcome/) is enabled for debug and enterprise builds.
+
 ### Additional Scripts
 
 1. `clean` - remove all `build` folders

diff --git a/app/src/debug/AndroidManifest.xml b/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">
+
+    <application android:networkSecurityConfig="@xml/network_security_config" />
+</manifest> 
diff --git a/app/src/debug/res/xml/network_security_config.xml b/app/src/debug/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config xmlns:tools="http://schemas.android.com/tools">
+    <base-config>
+        <trust-anchors>
+            <certificates src="user" tools:ignore="AcceptsUserCertificates"/>
+            <certificates src="system"/>
+        </trust-anchors>
+    </base-config>
+</network-security-config>
diff --git a/app/src/enterprise/AndroidManifest.xml b/app/src/enterprise/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application android:networkSecurityConfig="@xml/network_security_config" />
+</manifest> 
diff --git a/app/src/enterprise/res/xml/network_security_config.xml b/app/src/enterprise/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config xmlns:tools="http://schemas.android.com/tools">
+    <base-config>
+        <trust-anchors>
+            <certificates src="user" tools:ignore="AcceptsUserCertificates"/>
+            <certificates src="system"/>
+        </trust-anchors>
+    </base-config>
+</network-security-config>
diff --git a/buildSrc/src/main/kotlin/ProjectSettings.kt b/buildSrc/src/main/kotlin/ProjectSettings.kt
@@ -2,7 +2,7 @@ object ProjectSettings {
     const val applicationId = "app.futured.androidprojecttemplate"
     const val compileSdkVersion = 34
     const val targetSdk = 34
-    const val minSdk = 21
+    const val minSdk = 29
     val versionName = System.getenv("VERSION_NAME") ?: "1.0.0"
     val versionCode = System.getenv("BUILD_NUMBER")?.toInt() ?: 1