Merge pull request #986 from ImranR98/dev

Switch back to serial BG installs (#984), Fix UpToDown again (#982)
2025-10-25 03:43:46 +02:00 · 2023-10-11 21:01:09 -04:00
parent f0809cde72 0f72e37272
commit d267343c64
5 changed files with 130 additions and 121 deletions
--- a/lib/app_sources/uptodown.dart
+++ b/lib/app_sources/uptodown.dart
@@ -35,7 +35,7 @@ class Uptodown extends AppSource {
    var html = parse(res.body);
    String? version = html.querySelector('div.version')?.innerHtml;
    String? apkUrl =
-        html.querySelector('#detail-download-button')?.attributes['data-url'];
+        '${standardUrl.split('/').reversed.toList().sublist(1).reversed.join('/')}/post-download';
    String? name = html.querySelector('#detail-app-name')?.innerHtml.trim();
    String? author = html.querySelector('#author-link')?.innerHtml.trim();
    var detailElements = html.querySelectorAll('#technical-information td');
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -19,7 +19,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';

-const String currentVersion = '0.14.25';
+const String currentVersion = '0.14.26';
 const String currentReleaseTag =
    'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES

--- a/lib/providers/apps_provider.dart
+++ b/lib/providers/apps_provider.dart
@@ -1136,7 +1136,6 @@ class AppsProvider with ChangeNotifier {
        return null;
      }
      if (exportDir == null) {
-        logs.add('Skipping auto-export as dir is not set.');
        return null;
      }
      var files = await saf
@@ -1369,8 +1368,49 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
        (<List<MapEntry<String, int>>>[]))
  ];

-  bool installMode = toCheck.isEmpty &&
-      toInstall.isNotEmpty; // Task is either in update mode or install mode
+  var netResult = await (Connectivity().checkConnectivity());
+
+  if (netResult == ConnectivityResult.none) {
+    var networkBasedRetryInterval = 15;
+    var nextRegularCheck = appsProvider.settingsProvider.lastBGCheckTime
+        .add(Duration(minutes: appsProvider.settingsProvider.updateInterval));
+    var potentialNetworkRetryCheck =
+        DateTime.now().add(Duration(minutes: networkBasedRetryInterval));
+    var shouldRetry = potentialNetworkRetryCheck.isBefore(nextRegularCheck);
+    logs.add(
+        'BG update task $taskId: No network. Will ${shouldRetry ? 'retry in $networkBasedRetryInterval minutes' : 'not retry'}.');
+    AndroidAlarmManager.oneShot(
+        const Duration(minutes: 15), taskId + 1, bgUpdateCheck,
+        params: {
+          'toCheck': toCheck
+              .map((entry) => {'key': entry.key, 'value': entry.value})
+              .toList(),
+          'toInstall': toInstall
+              .map((entry) => {'key': entry.key, 'value': entry.value})
+              .toList(),
+        });
+    return;
+  }
+
+  var networkRestricted = false;
+  if (appsProvider.settingsProvider.bgUpdatesOnWiFiOnly) {
+    networkRestricted = (netResult != ConnectivityResult.wifi) &&
+        (netResult != ConnectivityResult.ethernet);
+  }
+
+  bool installMode =
+      toCheck.isEmpty; // Task is either in update mode or install mode
+
+  // In install mode, grab all available silent updates unless explicitly told otherwise
+  if (installMode && toInstall.isEmpty && !networkRestricted) {
+    var temp = appsProvider.findExistingUpdates(installedOnly: true);
+    for (var i = 0; i < temp.length; i++) {
+      if (await appsProvider
+          .canInstallSilently(appsProvider.apps[temp[i]]!.app)) {
+        toInstall.add(MapEntry(temp[i], 0));
+      }
+    }
+  }

  logs.add(
      'BG ${installMode ? 'install' : 'update'} task $taskId: Started (${installMode ? toInstall.length : toCheck.length}).');
@@ -1400,109 +1440,81 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
  }

  if (!installMode) {
-    // If in update mode, we check for updates.
-    // We divide the results into 4 groups:
-    // - toNotify - Apps with updates that the user will be notified about (can't be silently installed)
-    // - toRetry - Apps with update check errors that will be retried in a while
-    // - toThrow - Apps with update check errors that the user will be notified about (no retry)
-    // - toInstall - Apps with updates that will be installed silently
-    // After grouping the updates, we take care of toNotify and toThrow first
-    // Then if toRetry is not empty, we schedule another update task to run in a while (toInstall is retained)
-    // If toRetry is empty, we take care of toInstall
-
-    // Init. vars.
-    List<App> updates = [];
+    // If in update mode...
+    var didCompleteChecking = false;
+    CheckingUpdatesNotification? notif;
+    // Loop through all updates and check each
    List<App> toNotify = [];
-    List<MapEntry<String, int>> toRetry = [];
-    var retryAfterXSeconds = 0;
-    MultiAppMultiError toThrow = MultiAppMultiError();
-    var networkRestricted = false;
-    if (appsProvider.settingsProvider.bgUpdatesOnWiFiOnly) {
-      var netResult = await (Connectivity().checkConnectivity());
-      networkRestricted = (netResult != ConnectivityResult.wifi) &&
-          (netResult != ConnectivityResult.ethernet);
-    }
-    MultiAppMultiError? errors;
-    CheckingUpdatesNotification notif =
-        CheckingUpdatesNotification(plural('apps', toCheck.length));
-
    try {
-      // Check for updates
-      notificationsProvider.notify(notif, cancelExisting: true);
-      updates = await appsProvider.checkUpdates(
-          specificIds: toCheck.map((e) => e.key).toList());
-    } catch (e) {
-      // If there were errors, group them into toRetry and toThrow
-      if (e is Map) {
-        updates = e['updates'];
-        errors = e['errors'];
-        errors!.rawErrors.forEach((key, err) {
-          logs.add(
-              'BG update task $taskId: Got error on checking for $key \'${err.toString()}\'.');
-          var toCheckApp = toCheck.where((element) => element.key == key).first;
-          if (toCheckApp.value < maxAttempts) {
-            toRetry.add(MapEntry(toCheckApp.key, toCheckApp.value + 1));
-            var minRetryIntervalForThisApp = err is RateLimitError
-                ? (err.remainingMinutes * 60)
-                : e is ClientException
-                    ? (15 * 60)
-                    : pow(toCheckApp.value + 1, 2).toInt();
-            if (minRetryIntervalForThisApp > retryAfterXSeconds) {
-              retryAfterXSeconds = minRetryIntervalForThisApp;
+      for (int i = 0; i < toCheck.length; i++) {
+        var appId = toCheck[i].key;
+        var attemptCount = toCheck[i].value + 1;
+        AppInMemory? app = appsProvider.apps[appId];
+        if (app?.app.installedVersion != null) {
+          try {
+            notificationsProvider.notify(
+                notif = CheckingUpdatesNotification(app?.name ?? appId),
+                cancelExisting: true);
+            App? newApp = await appsProvider.checkUpdate(appId);
+            if (newApp != null) {
+              if (networkRestricted ||
+                  !(await appsProvider.canInstallSilently(app!.app))) {
+                toNotify.add(newApp);
+              }
+            }
+            if (i == (toCheck.length - 1)) {
+              didCompleteChecking = true;
+            }
+          } catch (e) {
+            // If you got an error, move the offender to the back of the line (increment their fail count) and schedule another task to continue checking shortly
+            logs.add(
+                'BG update task $taskId: Got error on checking for $appId \'${e.toString()}\'.');
+            if (attemptCount < maxAttempts) {
+              var remainingSeconds = e is RateLimitError
+                  ? (i == 0 ? (e.remainingMinutes * 60) : (5 * 60))
+                  : e is ClientException
+                      ? (15 * 60)
+                      : pow(attemptCount, 2).toInt();
+              logs.add(
+                  'BG update task $taskId: Will continue in $remainingSeconds seconds (with $appId moved to the end of the line).');
+              var remainingToCheck = moveStrToEndMapEntryWithCount(
+                  toCheck.sublist(i), MapEntry(appId, attemptCount));
+              AndroidAlarmManager.oneShot(Duration(seconds: remainingSeconds),
+                  taskId + 1, bgUpdateCheck,
+                  params: {
+                    'toCheck': remainingToCheck
+                        .map(
+                            (entry) => {'key': entry.key, 'value': entry.value})
+                        .toList(),
+                    'toInstall': toInstall
+                        .map(
+                            (entry) => {'key': entry.key, 'value': entry.value})
+                        .toList(),
+                  });
+              break;
+            } else {
+              // If the offender has reached its fail limit, notify the user and remove it from the list (task can continue)
+              toCheck.removeAt(i);
+              i--;
+              notificationsProvider
+                  .notify(ErrorCheckingUpdatesNotification(e.toString()));
+            }
+          } finally {
+            if (notif != null) {
+              notificationsProvider.cancel(notif.id);
            }
          } else {
            toThrow.add(key, err, appName: errors?.appIdNames[key]);
          }
-        });
-      } else {
-        // We don't expect to ever get here in any situation so no need to catch
-        logs.add('Fatal error in BG update task: ${e.toString()}');
-        rethrow;
+        }
      }
    } finally {
-      notificationsProvider.cancel(notif.id);
-    }
-
-    // Group the updates into toNotify and toInstall
-    for (var i = 0; i < updates.length; i++) {
-      if (networkRestricted ||
-          !(await appsProvider.canInstallSilently(updates[i]))) {
-        toNotify.add(updates[i]);
-      } else {
-        toInstall.add(MapEntry(updates[i].id, 0));
+      if (toNotify.isNotEmpty) {
+        notificationsProvider.notify(UpdateNotification(toNotify));
      }
    }
-
-    // Send the update notification
-    if (toNotify.isNotEmpty) {
-      notificationsProvider.notify(UpdateNotification(toNotify));
-    }
-
-    // Send the error notifications
-    if (toThrow.rawErrors.isNotEmpty) {
-      for (var element in toThrow.idsByErrorString.entries) {
-        notificationsProvider.notify(ErrorCheckingUpdatesNotification(
-            errors!.errorsAppsString(element.key, element.value),
-            id: Random().nextInt(10000)));
-      }
-    }
-
-    // if there are update checks to retry, schedule a retry task
-    if (toRetry.isNotEmpty) {
-      logs.add(
-          'BG update task $taskId: Will retry in $retryAfterXSeconds seconds.');
-      AndroidAlarmManager.oneShot(
-          Duration(seconds: retryAfterXSeconds), taskId + 1, bgUpdateCheck,
-          params: {
-            'toCheck': toRetry
-                .map((entry) => {'key': entry.key, 'value': entry.value})
-                .toList(),
-            'toInstall': toInstall
-                .map((entry) => {'key': entry.key, 'value': entry.value})
-                .toList(),
-          });
-    } else if (toInstall.isNotEmpty) {
-      // If there are no more update checks, schedule an install task
+    // If you're done checking and found some silently installable updates, schedule another task which will run in install mode
+    if (didCompleteChecking) {
      logs.add(
          'BG update task $taskId: Done. Scheduling install task to run immediately.');
      AndroidAlarmManager.oneShot(
@@ -1513,14 +1525,11 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
                .map((entry) => {'key': entry.key, 'value': entry.value})
                .toList()
          });
-    } else {
-      logs.add('BG install task $taskId: Done.');
+    } else if (didCompleteChecking) {
+      logs.add('BG update task $taskId: Done.');
    }
-  }
-
-  if (installMode) {
-    // If in install mode, we install silent updates.
-
+  } else {
+    // If in install mode...
    var didCompleteInstalling = false;
    var tempObtArr = toInstall.where((element) => element.key == obtainiumId);
    if (tempObtArr.isNotEmpty) {
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,18 +5,18 @@ packages:
    dependency: "direct main"
    description:
      name: android_alarm_manager_plus
-      sha256: c20d91a9096596f66274bf8172321c278f9cba8091638f80205fe66d31587fa5
+      sha256: "82fb28c867c4b3dd7e9157728e46426b8916362f977dbba46b949210f00099f4"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
  android_intent_plus:
    dependency: "direct main"
    description:
      name: android_intent_plus
-      sha256: f72ae20bb37108694f442e7ae6acbd28b453ca62ce86842f6787b784355abfe6
+      sha256: e1c62bb41c90e15083b7fb84dc327fe90396cc9c1445b55ff1082144fabfb4d9
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.2"
+    version: "4.0.3"
  android_package_installer:
    dependency: "direct main"
    description:
@@ -46,10 +46,10 @@ packages:
    dependency: transitive
    description:
      name: archive
-      sha256: ca12e6c9ac022f33fd89128e7007fb5e97ab6e814d4fa05dd8d4f2db1e3c69cb
+      sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03"
      url: "https://pub.dev"
    source: hosted
-    version: "3.4.5"
+    version: "3.4.6"
  args:
    dependency: transitive
    description:
@@ -118,10 +118,10 @@ packages:
    dependency: "direct main"
    description:
      name: connectivity_plus
-      sha256: "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b"
+      sha256: "94d51c6f1299133a2baa4c5c3d2c11ec7d7fb4768dee5c52a56f7d7522fcf70e"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.2"
+    version: "5.0.0"
  connectivity_plus_platform_interface:
    dependency: transitive
    description:
@@ -562,10 +562,10 @@ packages:
    dependency: transitive
    description:
      name: permission_handler_platform_interface
-      sha256: f2343e9fa9c22ae4fd92d4732755bfe452214e7189afcc097380950cf567b4b2
+      sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4"
      url: "https://pub.dev"
    source: hosted
-    version: "3.11.5"
+    version: "3.12.0"
  permission_handler_windows:
    dependency: transitive
    description:
@@ -586,10 +586,10 @@ packages:
    dependency: transitive
    description:
      name: platform
-      sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
+      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
  plugin_platform_interface:
    dependency: transitive
    description:
@@ -634,10 +634,10 @@ packages:
    dependency: "direct main"
    description:
      name: shared_preferences
-      sha256: b7f41bad7e521d205998772545de63ff4e6c97714775902c199353f8bf1511ac
+      sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
  shared_preferences_android:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -17,7 +17,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: 0.14.25+217 # When changing this, update the tag in main() accordingly
+version: 0.14.26+218 # When changing this, update the tag in main() accordingly

 environment:
  sdk: '>=3.0.0 <4.0.0'
@@ -64,7 +64,7 @@ dependencies:
  flutter_markdown: ^0.6.14
  flutter_archive: ^5.0.0
  hsluv: ^1.1.3
-  connectivity_plus: ^4.0.2
+  connectivity_plus: ^5.0.0
  shared_storage: ^0.8.0

 dev_dependencies: