Merge pull request #583 from yurark/fix/android-user-and-selfsigned-c…

…erts Android: support users certificates and fix video play with selfsigned proxy
lamarios · Sep 15, 2024 · 352f6ad · 352f6ad
2 parents 2216360 + 897afaa
commit 352f6ad
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 46 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -23,9 +23,9 @@ steps:
       - ./submodules/flutter/bin/flutter config --no-analytics
       - ./submodules/flutter/bin/flutter pub get
       - ./submodules/flutter/bin/flutter pub run flutter_native_splash:create
-      - ./submodules/flutter/bin/flutter build apk --split-per-abi
-      - ./submodules/flutter/bin/flutter build apk
-      - ./submodules/flutter/bin/flutter build appbundle
+      - ./submodules/flutter/bin/flutter build apk --split-per-abi --dart-define=cronetHttpNoPlay=true
+      - ./submodules/flutter/bin/flutter build apk --dart-define=cronetHttpNoPlay=true
+      - ./submodules/flutter/bin/flutter build appbundle --dart-define=cronetHttpNoPlay=true
       - cd /drone/src/
       - mkdir -p build/app/outputs/flutter-apk
       - mkdir -p build/app/outputs/bundle/release

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,7 +51,7 @@ jobs:
 #      - name: Run tests with nix (starts postgres and invidious server)
 #        run: nix-shell --run './submodules/flutter/bin/flutter test'
       - run: ./submodules/flutter/bin/flutter pub run flutter_native_splash:create
-      - run: ./submodules/flutter/bin/flutter build apk --profile --split-per-abi
+      - run: ./submodules/flutter/bin/flutter build apk --profile --split-per-abi --dart-define=cronetHttpNoPlay=true
       - name: Archive build artifacts
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -57,9 +57,9 @@ jobs:
           ./submodules/flutter/bin/flutter config --no-analytics
           ./submodules/flutter/bin/flutter pub get
           ./submodules/flutter/bin/flutter pub run flutter_native_splash:create
-          ./submodules/flutter/bin/flutter build apk --split-per-abi
-          ./submodules/flutter/bin/flutter build apk
-          ./submodules/flutter/bin/flutter build appbundle
+          ./submodules/flutter/bin/flutter build apk --split-per-abi --dart-define=cronetHttpNoPlay=true
+          ./submodules/flutter/bin/flutter build apk --dart-define=cronetHttpNoPlay=true
+          ./submodules/flutter/bin/flutter build appbundle --dart-define=cronetHttpNoPlay=true
       - name: Moving build artifacts
         run: | 
           mkdir -p build/app/outputs/flutter-apk

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -20,8 +20,11 @@
             android:label="Clipious"
             android:name="${applicationName}"
             android:icon="@mipmap/ic_launcher"
-            android:usesCleartextTraffic="true"
-            android:banner="@drawable/banner">
+            android:banner="@drawable/banner"
+            android:networkSecurityConfig="@xml/network_security_config" >
+
+        <meta-data android:name="io.flutter.network-policy"
+            android:resource="@xml/network_security_config" />
         <!--            android:enableOnBackInvokedCallback="true"-->
         <activity
                 android:name="com.linusu.flutter_web_auth.CallbackActivity"

diff --git a/android/app/src/main/res/xml/network_security_config.xml b/android/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>    
+</network-security-config>