Trust user added CA certificates (#4397)

* Update AndroidManifest.xml * Create network_security_config.xml * Allow user CA certs: Fix PR lint issues * Allow user CA certs: Add a new line --------- Co-authored-by: ABC <[email protected]>
jellyfin · Jan 17, 2025 · f6f324c · f6f324c
1 parent fe8399a
commit f6f324c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/android-lint.xml b/android-lint.xml
@@ -21,4 +21,8 @@
     <issue id="Typos" severity="ignore" />
     <issue id="UnknownNullness" severity="informational" />
     <issue id="UnusedIds" severity="ignore" />
+    <issue id="UnusedAttribute">
+        <ignore regexp="usesCleartextTraffic" />
+        <ignore regexp="networkSecurityConfig" />
+    </issue>
 </lint>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -49,7 +49,8 @@
         android:largeHeap="true"
         android:supportsRtl="true"
         android:theme="@style/Theme.Jellyfin"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <!-- Legacy service required for AccountManagerMigration -->
         <service

diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/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 cleartextTrafficPermitted="true" tools:ignore="InsecureBaseConfiguration" >
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" tools:ignore="AcceptsUserCertificates" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>