From 897afaa04ae5154af44ece4cdc8e2939fff6d43c Mon Sep 17 00:00:00 2001
From: Yury Ilinykh <yurark96@gmail.com>
Date: Tue, 6 Aug 2024 15:23:16 +0300
Subject: [PATCH] Android: support users certificates and fix video play with
 selfsigned proxy

---
 .drone.yml                                    |  6 +-
 .github/workflows/build.yml                   |  2 +-
 .github/workflows/release.yml                 |  6 +-
 android/app/src/main/AndroidManifest.xml      |  7 +-
 .../main/res/xml/network_security_config.xml  |  9 ++
 lib/service.dart                              | 85 +++++++++++--------
 pubspec.lock                                  | 26 +++++-
 pubspec.yaml                                  |  1 +
 8 files changed, 96 insertions(+), 46 deletions(-)
 create mode 100644 android/app/src/main/res/xml/network_security_config.xml

diff --git a/.drone.yml b/.drone.yml
index c3afe3a5..0e8afa3b 100644
--- 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
index 25c39ed7..e9451dd3 100644
--- 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
index 8a6f8a74..87daeeb8 100644
--- 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
index d9fd1814..016ec939 100644
--- 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
new file mode 100644
index 00000000..2c2fc863
--- /dev/null
+++ 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>
diff --git a/lib/service.dart b/lib/service.dart
index 77a7dbe0..a21b7ad5 100644
--- a/lib/service.dart
+++ b/lib/service.dart
@@ -1,9 +1,11 @@
 import 'dart:convert';
+import 'dart:io' show Platform;
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter_web_auth/flutter_web_auth.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/http.dart';
+import 'package:cronet_http/cronet_http.dart';
 import 'package:invidious/channels/models/channel_sort_by.dart';
 import 'package:invidious/extensions.dart';
 import 'package:invidious/globals.dart';
@@ -76,7 +78,18 @@ const imgurClientId = 'Client-ID 2cfbc27ce77879d';
 const maxPing = 9007199254740991;
 
 class Service {
-  final log = Logger('Service');
+  final log;
+  final Client httpClient;
+
+  Service() :
+    log = Logger('Service'),
+    httpClient = Platform.isAndroid ?
+      CronetClient.fromCronetEngine(
+        CronetEngine.build(
+          cacheMode: CacheMode.memory,
+          cacheMaxSize: 2 * 1024 * 1024),
+        closeEngine: true) :
+      http.Client();
 
   String urlFormatForLog(Uri? uri) {
     return kDebugMode ? uri.toString() : '${uri?.replace(host: 'xxxxxxxxxx')}';
@@ -153,7 +166,7 @@ class Service {
 
   Future<Video> getVideo(String videoId) async {
     var url = await buildUrl(urlGetVideo, pathParams: {':id': videoId});
-    final response = await http.get(url,
+    final response = await httpClient.get(url,
         headers: {'Content-Type': 'application/json; charset=utf-16'});
 
     var video = Video.fromJson(handleResponse(response));
@@ -169,7 +182,7 @@ class Service {
       String url = '$serverUrl/login?type=invidious';
       var map = {'email': username, 'password': password};
 
-      final response = await http.post(Uri.parse(url), body: map);
+      final response = await httpClient.post(Uri.parse(url), body: map);
       if (response.statusCode == 302 &&
           response.headers.containsKey('set-cookie')) {
         // we have a cookie to parse
@@ -236,7 +249,7 @@ class Service {
     }
 
     var url = await buildUrl(urlGetTrending, query: query);
-    final response = await http.get(url);
+    final response = await httpClient.get(url);
 
     Iterable i = handleResponse(response);
     var list = List<VideoInList>.from(i.map((e) => VideoInList.fromJson(e)));
@@ -246,7 +259,7 @@ class Service {
 
   Future<List<VideoInList>> getPopular() async {
     var url = await buildUrl(urlGetPopular);
-    final response = await http.get(url);
+    final response = await httpClient.get(url);
     Iterable i = handleResponse(response);
     var list = List<VideoInList>.from(i.map((e) => VideoInList.fromJson(e)));
     list = (await postProcessVideos(list)).cast();
@@ -269,7 +282,7 @@ class Service {
       'date': date != SearchDate.any ? date.name : null,
       'duration': duration != SearchDuration.any ? duration.name : null,
     });
-    final response = await http.get(uri);
+    final response = await httpClient.get(uri);
     Iterable i = handleResponse(response);
     // only getting videos for now
     SearchResults results = SearchResults();
@@ -307,7 +320,7 @@ class Service {
     });
 
     var headers = getAuthenticationHeaders(currentlySelectedServer);
-    final response = await http.get(uri, headers: headers);
+    final response = await httpClient.get(uri, headers: headers);
     var feed = UserFeed.fromJson(handleResponse(response));
     feed.videos = (await postProcessVideos(feed.videos ?? [])).cast();
     feed.notifications =
@@ -338,7 +351,7 @@ class Service {
       }
 
       log.info('Calling $url');
-      final response = await http.get(Uri.parse(url));
+      final response = await httpClient.get(Uri.parse(url));
       Iterable i = handleResponse(response);
       return List<SponsorSegment>.from(
           i.map((e) => SponsorSegment.fromJson(e)));
@@ -352,7 +365,7 @@ class Service {
       String url = urlGetDeArrow.replaceAll(":id", videoId);
 
       log.fine("calling $url");
-      final response = await http.get((Uri.parse(url)));
+      final response = await httpClient.get((Uri.parse(url)));
       var body = utf8.decode(response.bodyBytes);
       var deArrow = DeArrow.fromJson(jsonDecode(body));
       deArrow.videoId = videoId;
@@ -364,7 +377,7 @@ class Service {
 
   Future<bool> testDeArrowThumbnail(String? url) async {
     if (url != null) {
-      final response = await http.head(Uri.parse(url));
+      final response = await httpClient.head(Uri.parse(url));
       log.fine("calling $url => ${response.statusCode}");
       return response.statusCode == 200;
     } else {
@@ -374,7 +387,7 @@ class Service {
 
   Future<SearchSuggestion> getSearchSuggestion(String query) async {
     if (query.isEmpty) return SearchSuggestion(query, []);
-    final response = await http.get(await buildUrl(urlSearchSuggestions,
+    final response = await httpClient.get(await buildUrl(urlSearchSuggestions,
         query: {"q": Uri.encodeQueryComponent(query)}));
     SearchSuggestion search =
         SearchSuggestion.fromJson(handleResponse(response));
@@ -394,7 +407,7 @@ class Service {
     try {
       String url = serverUrl + urlStats;
       log.info('Calling $url');
-      final response = await http.get(Uri.parse(url));
+      final response = await httpClient.get(Uri.parse(url));
       Map<String, dynamic> json = handleResponse(response);
 
       if (json.containsKey("software") &&
@@ -427,7 +440,7 @@ class Service {
         pathParams: {":ucid": channelId});
     var headers = getAuthenticationHeaders(currentlySelectedServer);
 
-    final response = await http.post(url, headers: headers);
+    final response = await httpClient.post(url, headers: headers);
     log.info('${response.statusCode} - ${response.body}');
 
     if (response.statusCode == 204 || response.statusCode == 403) {
@@ -446,7 +459,7 @@ class Service {
         pathParams: {":ucid": channelId});
     var headers = getAuthenticationHeaders(currentlySelectedServer);
 
-    final response = await http.delete(url, headers: headers);
+    final response = await httpClient.delete(url, headers: headers);
     log.info('${response.statusCode} - ${response.body}');
 
     if (response.statusCode == 204 || response.statusCode == 403) {
@@ -472,7 +485,7 @@ class Service {
     var url = await buildUrl(urlGetSubscriptions);
     var headers = getAuthenticationHeaders(currentlySelectedServer);
 
-    final response = await http.get(url, headers: headers);
+    final response = await httpClient.get(url, headers: headers);
     Iterable i = handleResponse(response);
 
     return List<Subscription>.from(i.map((e) => Subscription.fromJson(e)));
@@ -487,7 +500,7 @@ class Service {
     if (sortBy != null) queryStr.putIfAbsent('sort_by', () => sortBy);
     if (source != null) queryStr.putIfAbsent('source', () => source);
 
-    final response = await http.get(await buildUrl(urlGetComments,
+    final response = await httpClient.get(await buildUrl(urlGetComments,
         pathParams: {':id': videoId}, query: queryStr));
     return VideoComments.fromJson(handleResponse(response));
   }
@@ -495,7 +508,7 @@ class Service {
   Future<Channel> getChannel(String channelId) async {
     // sometimes the api gives the channel with /channel/<channelid> format
     channelId = channelId.replaceAll("/channel/", '');
-    final response = await http.get(
+    final response = await httpClient.get(
         await buildUrl(urlGetChannel, pathParams: {':id': channelId}),
         headers: {'Content-Type': 'application/json; charset=utf-16'});
 
@@ -520,7 +533,7 @@ class Service {
       'continuation': continuation,
       'sort_by': sortBy.name,
     });
-    final response = await http.get(uri,
+    final response = await httpClient.get(uri,
         headers: {'Content-Type': 'application/json; charset=utf-16'});
 
     var videosWithContinuation =
@@ -539,7 +552,7 @@ class Service {
       String channelId, String? continuation) async {
     Uri uri = await buildUrl(urlGetChannelStreams,
         pathParams: {':id': channelId}, query: {'continuation': continuation});
-    final response = await http.get(uri,
+    final response = await httpClient.get(uri,
         headers: {'Content-Type': 'application/json; charset=utf-16'});
 
     var videosWithContinuation =
@@ -553,7 +566,7 @@ class Service {
       String channelId, String? continuation) async {
     Uri uri = await buildUrl(urlGetChannelShorts,
         pathParams: {':id': channelId}, query: {'continuation': continuation});
-    final response = await http.get(uri,
+    final response = await httpClient.get(uri,
         headers: {'Content-Type': 'application/json; charset=utf-16'});
 
     var videosWithContinuation =
@@ -570,7 +583,7 @@ class Service {
       var url = await buildUrl(urlGetUserPlaylists);
       var headers = getAuthenticationHeaders(currentlySelectedServer);
 
-      final response = await http.get(url, headers: headers);
+      final response = await httpClient.get(url, headers: headers);
       Iterable i = handleResponse(response);
       var list = List<Playlist>.from(i.map((e) => Playlist.fromJson(e)));
       if (postProcessing) {
@@ -589,7 +602,7 @@ class Service {
     Uri uri = await buildUrl(urlGetChannelPlaylists,
         pathParams: {':id': channelId}, query: {'continuation': continuation});
 
-    final response = await http.get(uri);
+    final response = await httpClient.get(uri);
     var channelPlaylists = ChannelPlaylists.fromJson(handleResponse(response));
     for (var pl in channelPlaylists.playlists) {
       pl.videos = (await postProcessVideos(pl.videos)).cast();
@@ -612,7 +625,7 @@ class Service {
     log.info(jsonEncode(body));
 
     final response =
-        await http.post(url, headers: headers, body: jsonEncode(body));
+        await httpClient.post(url, headers: headers, body: jsonEncode(body));
     Map<String, dynamic> playlist = handleResponse(response);
     return playlist['playlistId'] as String;
   }
@@ -630,7 +643,7 @@ class Service {
     };
 
     final response =
-        await http.post(url, headers: headers, body: jsonEncode(body));
+        await httpClient.post(url, headers: headers, body: jsonEncode(body));
     handleResponse(response);
   }
 
@@ -643,7 +656,7 @@ class Service {
     var headers = getAuthenticationHeaders(currentlySelectedServer);
     headers['Content-Type'] = 'application/json';
 
-    final response = await http.delete(url, headers: headers);
+    final response = await httpClient.delete(url, headers: headers);
     handleResponse(response);
   }
 
@@ -656,7 +669,7 @@ class Service {
     var headers = getAuthenticationHeaders(currentlySelectedServer);
     headers['Content-Type'] = 'application/json';
 
-    final response = await http.delete(url, headers: headers);
+    final response = await httpClient.delete(url, headers: headers);
     handleResponse(response);
   }
 
@@ -668,7 +681,7 @@ class Service {
     var headers = getAuthenticationHeaders(currentlySelectedServer);
     headers['Content-Type'] = 'application/json';
 
-    final response = await http.get(url, headers: headers);
+    final response = await httpClient.get(url, headers: headers);
     Iterable i = handleResponse(response);
 
     return List<String>.from(i.map((e) => e as String));
@@ -696,7 +709,7 @@ class Service {
     var headers = getAuthenticationHeaders(currentlySelectedServer);
     headers['Content-Type'] = 'application/json';
 
-    final response = await http.delete(url, headers: headers);
+    final response = await httpClient.delete(url, headers: headers);
     handleResponse(response);
   }
 
@@ -707,7 +720,7 @@ class Service {
     var headers = getAuthenticationHeaders(currentlySelectedServer);
     headers['Content-Type'] = 'application/json';
 
-    final response = await http.delete(url, headers: headers);
+    final response = await httpClient.delete(url, headers: headers);
     handleResponse(response);
   }
 
@@ -718,7 +731,7 @@ class Service {
     var headers = getAuthenticationHeaders(currentlySelectedServer);
     headers['Content-Type'] = 'application/json';
 
-    final response = await http.post(url, headers: headers);
+    final response = await httpClient.post(url, headers: headers);
     handleResponse(response);
   }
 
@@ -726,7 +739,7 @@ class Service {
     int start = DateTime.now().millisecondsSinceEpoch;
     String fullUri = '$url$urlStats';
     log.fine('ping $fullUri');
-    final response = await http.get(Uri.parse(fullUri),
+    final response = await httpClient.get(Uri.parse(fullUri),
         headers: {'Content-Type': 'application/json; charset=utf-16'});
 
     try {
@@ -740,7 +753,7 @@ class Service {
   }
 
   Future<List<InvidiousPublicServer>> getPublicServers() async {
-    final response = await http.get(Uri.parse(urlGetInvidiousPublicServers));
+    final response = await httpClient.get(Uri.parse(urlGetInvidiousPublicServers));
     List<InvidiousPublicServer> servers = [];
     Iterable i = handleResponse(response);
 
@@ -762,7 +775,7 @@ class Service {
     Uri uri = await buildUrl(urlGetPublicPlaylist,
         pathParams: {':id': playlistId}, query: {'page': page?.toString()});
 
-    final response = await http.get(uri);
+    final response = await httpClient.get(uri);
     var playlist = Playlist.fromJson(handleResponse(response));
     var oldLength = playlist.videos.length;
     playlist.videos = (await postProcessVideos(playlist.videos)).cast();
@@ -784,7 +797,7 @@ class Service {
 
     var headers = getAuthenticationHeaders(currentlySelectedServer);
 
-    final response = await http.get(uri, headers: headers);
+    final response = await httpClient.get(uri, headers: headers);
     var playlist = Playlist.fromJson(handleResponse(response));
     var oldLength = playlist.videos.length;
     playlist.videos = (await postProcessVideos(playlist.videos)).cast();
@@ -802,7 +815,7 @@ class Service {
             : urlGetDislikes) +
         videoId);
 
-    final response = await http.get(uri);
+    final response = await httpClient.get(uri);
     return Dislike.fromJson(handleResponse(response));
   }
 
@@ -812,7 +825,7 @@ class Service {
 
     final data = <String, String>{'image': base64Image};
 
-    final response = await http.post(uri, headers: headers, body: data);
+    final response = await httpClient.post(uri, headers: headers, body: data);
     if (response.statusCode != 200) {
       throw ImgurError("Non 200 response from Imgur (${response.statusCode})");
     } else {
diff --git a/pubspec.lock b/pubspec.lock
index 0b55c55e..267f257c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -326,6 +326,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.8.0"
+  cronet_http:
+    dependency: "direct main"
+    description:
+      name: cronet_http
+      sha256: "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
   cross_file:
     dependency: transitive
     description:
@@ -668,6 +676,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  http_profile:
+    dependency: transitive
+    description:
+      name: http_profile
+      sha256: "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   image:
     dependency: transitive
     description:
@@ -692,6 +708,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  jni:
+    dependency: transitive
+    description:
+      name: jni
+      sha256: f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.1"
   js:
     dependency: transitive
     description:
@@ -1574,4 +1598,4 @@ packages:
     version: "3.1.2"
 sdks:
   dart: ">=3.4.0 <4.0.0"
-  flutter: ">=3.19.0"
+  flutter: ">=3.22.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index e1f697cb..d8606ffc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,6 +16,7 @@ dependencies:
   cached_network_image: 3.3.1
   carousel_slider: 4.2.1
   copy_with_extension: 5.0.4
+  cronet_http: 1.3.2
   device_info_plus: 10.1.0
   dio: 5.4.3+1
   dynamic_color: 1.7.0