Merge pull request #2266 from ImranR98/dev

Bugfix

lib/app_sources/html.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
@@ -67,6 +69,27 @@ int compareAlphaNumeric(String a, String b) {
   return aParts.length.compareTo(bParts.length);
 }
 
+List<String> collectAllStringsFromJSONObject(dynamic obj) {
+  List<String> extractor(dynamic obj) {
+    final results = <String>[];
+    if (obj is String) {
+      results.add(obj);
+    } else if (obj is List) {
+      for (final item in obj) {
+        results.addAll(extractor(item));
+      }
+    } else if (obj is Map<String, dynamic>) {
+      for (final value in obj.values) {
+        results.addAll(extractor(value));
+      }
+    }
+
+    return results;
+  }
+
+  return extractor(obj);
+}
+
 List<String> _splitAlphaNumeric(String s) {
   List<String> parts = [];
   StringBuffer sb = StringBuffer();
@@ -95,6 +118,13 @@ bool _isNumeric(String s) {
   return s.codeUnitAt(0) >= 48 && s.codeUnitAt(0) <= 57;
 }
 
+List<MapEntry<String, String>> getLinksInLines(String lines) => RegExp(
+        r'(http|ftp|https)://([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?')
+    .allMatches(lines)
+    .map((match) =>
+        MapEntry(match.group(0)!, match.group(0)?.split('/').last ?? ''))
+    .toList();
+
 // Given an HTTP response, grab some links according to the common additional settings
 // (those that apply to intermediate and final steps)
 Future<List<MapEntry<String, String>>> grabLinksCommon(
@@ -114,12 +144,21 @@ Future<List<MapEntry<String, String>>> grabLinksCommon(
       .map((e) => MapEntry(ensureAbsoluteUrl(e.key, res.request!.url), e.value))
       .toList();
   if (allLinks.isEmpty) {
-    allLinks = RegExp(
-            r'(http|ftp|https)://([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?')
-        .allMatches(res.body)
-        .map((match) =>
-            MapEntry(match.group(0)!, match.group(0)?.split('/').last ?? ''))
-        .toList();
+    allLinks = getLinksInLines(res.body);
+  }
+  if (allLinks.isEmpty) {
+    // Getting desperate
+    try {
+      var jsonStrings = collectAllStringsFromJSONObject(jsonDecode(res.body));
+      allLinks = getLinksInLines(jsonStrings.join('\n'));
+      if (allLinks.isEmpty) {
+        allLinks = getLinksInLines(jsonStrings.map((l) {
+          return ensureAbsoluteUrl(l, res.request!.url);
+        }).join('\n'));
+      }
+    } catch (e) {
+      //
+    }
   }
   List<MapEntry<String, String>> links = [];
   bool skipSort = additionalSettings['skipSort'] == true;

lib/providers/apps_provider.dart

@@ -7,7 +7,6 @@ import 'dart:io';
 import 'dart:math';
 import 'package:battery_plus/battery_plus.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:http/http.dart' as http;
 import 'package:crypto/crypto.dart';
 import 'dart:typed_data';
 
@@ -246,9 +245,9 @@ Future<File> downloadFile(String url, String fileName, bool fileNameHasExt,
   var reqHeaders = headers ?? {};
   var req = Request('GET', Uri.parse(url));
   req.headers.addAll(reqHeaders);
-  var client = IOClient(createHttpClient(allowInsecure));
-  StreamedResponse response = await client.send(req);
-  var resHeaders = response.headers;
+  var headersClient = IOClient(createHttpClient(allowInsecure));
+  StreamedResponse headersResponse = await headersClient.send(req);
+  var resHeaders = headersResponse.headers;
 
   // Use the headers to decide what the file extension is, and
   // whether it supports partial downloads (range request), and
@@ -276,21 +275,20 @@ Future<File> downloadFile(String url, String fileName, bool fileNameHasExt,
     rangeFeatureEnabled =
         resHeaders['accept-ranges']?.trim().toLowerCase() == 'bytes';
   }
+  headersClient.close();
 
   // If you have an existing file that is usable,
   // decide whether you can use it (either return full or resume partial)
-  var fullContentLength = response.contentLength;
+  var fullContentLength = headersResponse.contentLength;
   if (useExisting && downloadedFile.existsSync()) {
     var length = downloadedFile.lengthSync();
     if (fullContentLength == null || !rangeFeatureEnabled) {
       // If there is no content length reported, assume it the existing file is fully downloaded
       // Also if the range feature is not supported, don't trust the content length if any (#1542)
-      client.close();
       return downloadedFile;
     } else {
       // Check if resume needed/possible
       if (length == fullContentLength) {
-        client.close();
         return downloadedFile;
       }
       if (length > fullContentLength) {
@@ -330,7 +328,6 @@ Future<File> downloadFile(String url, String fileName, bool fileNameHasExt,
     if (shouldReturn) {
       logs?.add(
           'Existing partial download completed - not repeating: ${tempDownloadedFile.uri.pathSegments.last}');
-      client.close();
       return downloadedFile;
     } else {
       logs?.add(
@@ -346,17 +343,18 @@ Future<File> downloadFile(String url, String fileName, bool fileNameHasExt,
       : null;
   int rangeStart = targetFileLength ?? 0;
   IOSink? sink;
+  req = Request('GET', Uri.parse(url));
+  req.headers.addAll(reqHeaders);
   if (rangeFeatureEnabled && fullContentLength != null && rangeStart > 0) {
-    client.close();
-    client = IOClient(createHttpClient(allowInsecure));
-    req = Request('GET', Uri.parse(url));
-    req.headers.addAll(reqHeaders);
-    req.headers.addAll({'range': 'bytes=$rangeStart-${fullContentLength - 1}'});
-    response = await client.send(req);
+    reqHeaders.addAll({'range': 'bytes=$rangeStart-${fullContentLength - 1}'});
     sink = tempDownloadedFile.openWrite(mode: FileMode.writeOnlyAppend);
   } else if (tempDownloadedFile.existsSync()) {
     tempDownloadedFile.deleteSync(recursive: true);
   }
+  var responseWithClient =
+      await sourceRequestStreamResponse('GET', url, reqHeaders, {});
+  HttpClient responseClient = responseWithClient.key;
+  HttpClientResponse response = responseWithClient.value;
   sink ??= tempDownloadedFile.openWrite(mode: FileMode.writeOnly);
 
   // Perform the download
@@ -369,7 +367,8 @@ Future<File> downloadFile(String url, String fileName, bool fileNameHasExt,
   const downloadUIUpdateInterval = Duration(milliseconds: 500);
   const downloadBufferSize = 32 * 1024; // 32KB
   final downloadBuffer = BytesBuilder();
-  await response.stream
+  await response
+      .asBroadcastStream()
       .map((chunk) {
         received += chunk.length;
         final now = DateTime.now();
@@ -407,31 +406,15 @@ Future<File> downloadFile(String url, String fileName, bool fileNameHasExt,
   }
   if (response.statusCode < 200 || response.statusCode > 299) {
     tempDownloadedFile.deleteSync(recursive: true);
-    throw response.reasonPhrase ?? tr('unexpectedError');
+    throw response.reasonPhrase;
   }
   if (tempDownloadedFile.existsSync()) {
     tempDownloadedFile.renameSync(downloadedFile.path);
   }
-  client.close();
+  responseClient.close();
   return downloadedFile;
 }
 
-Future<Map<String, String>> getHeaders(String url,
-    {Map<String, String>? headers, bool allowInsecure = false}) async {
-  var req = http.Request('GET', Uri.parse(url));
-  if (headers != null) {
-    req.headers.addAll(headers);
-  }
-  var client = IOClient(createHttpClient(allowInsecure));
-  var response = await client.send(req);
-  if (response.statusCode < 200 || response.statusCode > 299) {
-    throw ObtainiumError(response.reasonPhrase ?? tr('unexpectedError'));
-  }
-  var returnHeaders = response.headers;
-  client.close();
-  return returnHeaders;
-}
-
 Future<List<PackageInfo>> getAllInstalledInfo() async {
   return await pm.getInstalledPackages() ?? [];
 }

lib/providers/notifications_provider.dart

@@ -197,26 +197,28 @@ class NotificationsProvider {
   }
 
   _showNotificationPayload(String? payload, {bool doublePop = false}) {
-    var title = (payload ?? '\n\n').split('\n').first;
-    var content = (payload ?? '\n\n').split('\n').sublist(1).join('\n');
-    globalNavigatorKey.currentState?.push(
-      PageRouteBuilder(
-        pageBuilder: (context, _, __) => AlertDialog(
-          title: Text(title),
-          content: Text(content),
-          actions: [
-            TextButton(
-                onPressed: () {
-                  Navigator.of(context).pop(null);
-                  if (doublePop) {
+    if (payload?.isNotEmpty == true) {
+      var title = (payload ?? '\n\n').split('\n').first;
+      var content = (payload ?? '\n\n').split('\n').sublist(1).join('\n');
+      globalNavigatorKey.currentState?.push(
+        PageRouteBuilder(
+          pageBuilder: (context, _, __) => AlertDialog(
+            title: Text(title),
+            content: Text(content),
+            actions: [
+              TextButton(
+                  onPressed: () {
                     Navigator.of(context).pop(null);
-                  }
-                },
-                child: Text(tr('ok'))),
-          ],
+                    if (doublePop) {
+                      Navigator.of(context).pop(null);
+                    }
+                  },
+                  child: Text(tr('ok'))),
+            ],
+          ),
         ),
-      ),
-    );
+      );
+    }
   }
 
   Future<void> cancel(int id) async {

lib/providers/source_provider.dart

@@ -510,6 +510,72 @@ HttpClient createHttpClient(bool insecure) {
   return client;
 }
 
+Future<MapEntry<HttpClient, HttpClientResponse>> sourceRequestStreamResponse(
+    String method,
+    String url,
+    Map<String, String>? requestHeaders,
+    Map<String, dynamic> additionalSettings,
+    {bool followRedirects = true,
+    Object? postBody}) async {
+  var currentUrl = Uri.parse(url);
+  var redirectCount = 0;
+  const maxRedirects = 10;
+  List<Cookie> cookies = [];
+  while (redirectCount < maxRedirects) {
+    var httpClient =
+        createHttpClient(additionalSettings['allowInsecure'] == true);
+    var request = await httpClient.openUrl(method, currentUrl);
+    if (requestHeaders != null) {
+      requestHeaders.forEach((key, value) {
+        request.headers.set(key, value);
+      });
+    }
+    request.cookies.addAll(cookies);
+    request.followRedirects = false;
+    if (postBody != null) {
+      request.headers.contentType = ContentType.json;
+      request.write(jsonEncode(postBody));
+    }
+    final response = await request.close();
+
+    if (followRedirects &&
+        (response.statusCode >= 300 && response.statusCode <= 399)) {
+      final location = response.headers.value(HttpHeaders.locationHeader);
+      if (location != null) {
+        currentUrl = Uri.parse(ensureAbsoluteUrl(location, currentUrl));
+        redirectCount++;
+        cookies = response.cookies;
+        httpClient.close();
+        continue;
+      }
+    }
+
+    return MapEntry(httpClient, response);
+  }
+  throw ObtainiumError('Too many redirects ($maxRedirects)');
+}
+
+Future<Response> httpClientResponseStreamToFinalResponse(HttpClient httpClient,
+    String method, String url, HttpClientResponse response) async {
+  final bytes =
+      (await response.fold<BytesBuilder>(BytesBuilder(), (b, d) => b..add(d)))
+          .toBytes();
+
+  final headers = <String, String>{};
+  response.headers.forEach((name, values) {
+    headers[name] = values.join(', ');
+  });
+
+  httpClient.close();
+
+  return http.Response.bytes(
+    bytes,
+    response.statusCode,
+    headers: headers,
+    request: http.Request(method, Uri.parse(url)),
+  );
+}
+
 abstract class AppSource {
   List<String> hosts = [];
   bool hostChanged = false;
@@ -567,64 +633,16 @@ abstract class AppSource {
   Future<Response> sourceRequest(
       String url, Map<String, dynamic> additionalSettings,
       {bool followRedirects = true, Object? postBody}) async {
+    var method = postBody == null ? 'GET' : 'POST';
     var requestHeaders = await getRequestHeaders(additionalSettings);
-
-    if (requestHeaders != null || followRedirects == false) {
-      var method = postBody == null ? 'GET' : 'POST';
-      var currentUrl = url;
-      var redirectCount = 0;
-      const maxRedirects = 10;
-      while (redirectCount < maxRedirects) {
-        var httpClient =
-            createHttpClient(additionalSettings['allowInsecure'] == true);
-        var request = await httpClient.openUrl(method, Uri.parse(currentUrl));
-        if (requestHeaders != null) {
-          requestHeaders.forEach((key, value) {
-            request.headers.set(key, value);
-          });
-        }
-        request.followRedirects = false;
-        if (postBody != null) {
-          request.headers.contentType = ContentType.json;
-          request.write(jsonEncode(postBody));
-        }
-        final response = await request.close();
-
-        if (followRedirects &&
-            (response.statusCode == 301 || response.statusCode == 302)) {
-          final location = response.headers.value(HttpHeaders.locationHeader);
-          if (location != null) {
-            currentUrl = location;
-            redirectCount++;
-            httpClient.close();
-            continue;
-          }
-        }
-
-        final bytes = (await response.fold<BytesBuilder>(
-                BytesBuilder(), (b, d) => b..add(d)))
-            .toBytes();
-
-        final headers = <String, String>{};
-        response.headers.forEach((name, values) {
-          headers[name] = values.join(', ');
-        });
-
-        httpClient.close();
-
-        return http.Response.bytes(
-          bytes,
-          response.statusCode,
-          headers: headers,
-          request: http.Request(method, Uri.parse(url)),
-        );
-      }
-      throw ObtainiumError('Too many redirects ($maxRedirects)');
-    } else {
-      return postBody == null
-          ? http.get(Uri.parse(url))
-          : http.post(Uri.parse(url), body: jsonEncode(postBody));
-    }
+    var streamedResponseAndClient = await sourceRequestStreamResponse(
+        method, url, requestHeaders, additionalSettings,
+        followRedirects: followRedirects, postBody: postBody);
+    return await httpClientResponseStreamToFinalResponse(
+        streamedResponseAndClient.key,
+        method,
+        url,
+        streamedResponseAndClient.value);
   }
 
   void runOnAddAppInputChange(String inputUrl) {

pubspec.lock

@@ -80,10 +80,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: a7f37ff061d7abc2fcf213554b9dcaca713c5853afa5c065c44888bc9ccaf813
+      sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "4.0.7"
   args:
     dependency: transitive
     description:
@@ -184,10 +184,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27"
+      sha256: "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.3"
+    version: "6.1.4"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -240,10 +240,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513"
+      sha256: "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53"
       url: "https://pub.dev"
     source: hosted
-    version: "11.3.3"
+    version: "11.4.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -506,10 +506,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3"
+      sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.27"
+    version: "2.0.28"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -564,10 +564,10 @@ packages:
     dependency: "direct main"
     description:
       name: html
-      sha256: "9475be233c437f0e3637af55e7702cbbe5c23a68bd56e8a5fa2d426297b7c6c8"
+      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.5+1"
+    version: "0.15.6"
   http:
     dependency: "direct main"
     description:
@@ -716,10 +716,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12"
+      sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.16"
+    version: "2.2.17"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -876,18 +876,18 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da
+      sha256: b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.4"
+    version: "11.0.0"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
+      sha256: "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.2"
+    version: "6.0.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -900,10 +900,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: c2c8c46297b5d6a80bed7741ec1f2759742c77d272f1a1698176ae828f8e1a18
+      sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.9"
+    version: "2.4.10"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -1107,10 +1107,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4"
+      sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.15"
+    version: "6.3.16"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -1147,10 +1147,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9"
+      sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -1203,10 +1203,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "3315f1306eb22f98c48fe203fb8a448fb23f9e49d55a4da6e17ab7d795774166"
+      sha256: "6b0eae02b7604954b80ee9a29507ac38f5de74b712faa6fee33abc1cdedc1b21"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "4.4.2"
   webview_flutter_platform_interface:
     dependency: transitive
     description:

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.1.50+2307
+version: 1.1.52+2309
 
 environment:
   sdk: ^3.6.0
@@ -57,7 +57,7 @@ dependencies:
     git:
       url: https://github.com/ImranR98/android_package_manager
       ref: master
-  share_plus: ^10.0.0
+  share_plus: ^11.0.0
   sqflite: ^2.2.0+3
   easy_localization: ^3.0.1
   android_intent_plus: ^5.0.1