Merge branch 'main' into re7gog

lib/app_sources/html.dart

@@ -94,7 +94,8 @@ class HTML extends AppSource {
         GeneratedFormSwitch('sortByFileNamesNotLinks',
             label: tr('sortByFileNamesNotLinks'))
       ],
-      [GeneratedFormSwitch('reverseSort', label: tr('reverseSort'))],
+      [GeneratedFormSwitch('skipSort', label: tr('skipSort'))],
+      [GeneratedFormSwitch('reverseSort', label: tr('takeTopLink'))],
       [
         GeneratedFormSwitch('supportFixedAPKURL',
             defaultValue: true, label: tr('supportFixedAPKURL')),
@@ -185,12 +186,15 @@ class HTML extends AppSource {
             .toList();
       }
       List<String> links = [];
+      bool skipSort = additionalSettings['skipSort'] == true;
       if ((additionalSettings['intermediateLinkRegex'] as String?)
               ?.isNotEmpty ==
           true) {
         var reg = RegExp(additionalSettings['intermediateLinkRegex']);
         links = allLinks.where((element) => reg.hasMatch(element)).toList();
-        links.sort((a, b) => compareAlphaNumeric(a, b));
+        if (!skipSort) {
+          links.sort((a, b) => compareAlphaNumeric(a, b));
+        }
         if (links.isEmpty) {
           throw ObtainiumError(tr('intermediateLinkNotFound'));
         }
@@ -211,10 +215,14 @@ class HTML extends AppSource {
                 Uri.parse(element).path.toLowerCase().endsWith('.apk'))
             .toList();
       }
-      links.sort((a, b) => additionalSettings['sortByFileNamesNotLinks'] == true
-          ? compareAlphaNumeric(a.split('/').where((e) => e.isNotEmpty).last,
-              b.split('/').where((e) => e.isNotEmpty).last)
-          : compareAlphaNumeric(a, b));
+      if (!skipSort) {
+        links.sort((a, b) =>
+            additionalSettings['sortByFileNamesNotLinks'] == true
+                ? compareAlphaNumeric(
+                    a.split('/').where((e) => e.isNotEmpty).last,
+                    b.split('/').where((e) => e.isNotEmpty).last)
+                : compareAlphaNumeric(a, b));
+      }
       if (additionalSettings['reverseSort'] == true) {
         links = links.reversed.toList();
       }

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.38';
+const String currentVersion = '0.14.40';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/apps.dart

@@ -496,14 +496,8 @@ class AppsPageState extends State<AppsPage> {
       var transparent =
           Theme.of(context).colorScheme.background.withAlpha(0).value;
       List<double> stops = [
-        ...listedApps[index]
-            .app
-            .categories
-            .asMap()
-            .entries
-            .map((e) =>
-                ((e.key / (listedApps[index].app.categories.length - 1))))
-            ,
+        ...listedApps[index].app.categories.asMap().entries.map(
+            (e) => ((e.key / (listedApps[index].app.categories.length - 1)))),
         1
       ];
       if (stops.length == 2) {
@@ -516,13 +510,9 @@ class AppsPageState extends State<AppsPage> {
                   begin: const Alignment(-1, 0),
                   end: const Alignment(-0.97, 0),
                   colors: [
-                ...listedApps[index]
-                    .app
-                    .categories
-                    .map((e) =>
-                        Color(settingsProvider.categories[e] ?? transparent)
-                            .withAlpha(255))
-                    ,
+                ...listedApps[index].app.categories.map((e) =>
+                    Color(settingsProvider.categories[e] ?? transparent)
+                        .withAlpha(255)),
                 Color(transparent)
               ])),
           child: ListTile(
@@ -881,7 +871,7 @@ class AppsPageState extends State<AppsPage> {
                         onPressed: () {
                           String urls = '';
                           for (var a in selectedApps) {
-                            urls += '${a.url}\n';
+                            urls += 'obtainium://add/${a.url}\n';
                           }
                           urls = urls.substring(0, urls.length - 1);
                           Share.share(urls,
@@ -981,10 +971,8 @@ class AppsPageState extends State<AppsPage> {
                       defaultValue: filter.sourceFilter,
                       [
                         MapEntry('', tr('none')),
-                        ...sourceProvider.sources
-                            .map((e) =>
-                                MapEntry(e.runtimeType.toString(), e.name))
-                            
+                        ...sourceProvider.sources.map(
+                            (e) => MapEntry(e.runtimeType.toString(), e.name))
                       ])
                 ]
               ],

lib/pages/settings.dart

@@ -352,6 +352,19 @@ class _SettingsPageState extends State<SettingsPage> {
                             ),
                             height16,
                             installMethodDropdown,
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(child: Text(tr('parallelDownloads'))),
+                                Switch(
+                                    value: settingsProvider.parallelDownloads,
+                                    onChanged: (value) {
+                                      settingsProvider.parallelDownloads =
+                                          value;
+                                    })
+                              ],
+                            ),
                             height32,
                             Text(
                               tr('sourceSpecific'),

lib/providers/apps_provider.dart

@@ -666,7 +666,7 @@ class AppsProvider with ChangeNotifier {
     appsToInstall =
         moveStrToEnd(appsToInstall, obtainiumId, strB: obtainiumTempId);
 
-    for (var id in appsToInstall) {
+    Future<void> updateFn(String id, {bool skipInstalls = false}) async {
       try {
         var downloadedArtifact =
             // ignore: use_build_context_synchronously
@@ -705,24 +705,26 @@ class AppsProvider with ChangeNotifier {
         apps[id]?.downloadProgress = -1;
         notifyListeners();
         try {
-          if (downloadedFile != null) {
-            if (willBeSilent && context == null) {
-              installApk(downloadedFile, needsBGWorkaround: true);
+          if (!skipInstalls) {
+            if (downloadedFile != null) {
+              if (willBeSilent && context == null) {
+                installApk(downloadedFile, needsBGWorkaround: true);
+              } else {
+                await installApk(downloadedFile);
+              }
             } else {
-              await installApk(downloadedFile);
+              if (willBeSilent && context == null) {
+                installXApkDir(downloadedDir!, needsBGWorkaround: true);
+              } else {
+                await installXApkDir(downloadedDir!);
+              }
             }
-          } else {
             if (willBeSilent && context == null) {
-              installXApkDir(downloadedDir!, needsBGWorkaround: true);
-            } else {
-              await installXApkDir(downloadedDir!);
+              notificationsProvider?.notify(SilentUpdateAttemptNotification(
+                  [apps[appId]!.app],
+                  id: appId.hashCode));
             }
           }
-          if (willBeSilent && context == null) {
-            notificationsProvider?.notify(SilentUpdateAttemptNotification(
-                [apps[appId]!.app],
-                id: appId.hashCode));
-          }
         } finally {
           apps[id]?.downloadProgress = null;
           notifyListeners();
@@ -733,6 +735,18 @@ class AppsProvider with ChangeNotifier {
       }
     }
 
+    if (!settingsProvider.parallelDownloads) {
+      for (var id in appsToInstall) {
+        await updateFn(id);
+      }
+    } else {
+      await Future.wait(
+          appsToInstall.map((id) => updateFn(id, skipInstalls: true)));
+      for (var id in appsToInstall) {
+        await updateFn(id);
+      }
+    }
+
     if (errors.idsByErrorString.isNotEmpty) {
       throw errors;
     }
@@ -749,12 +763,15 @@ class AppsProvider with ChangeNotifier {
     return appsDir;
   }
 
-  Future<PackageInfo?> getInstalledInfo(String? packageName) async {
+  Future<PackageInfo?> getInstalledInfo(String? packageName,
+      {bool printErr = true}) async {
     if (packageName != null) {
       try {
         return await pm.getPackageInfo(packageName: packageName);
       } catch (e) {
-        print(e); // OK
+        if (printErr) {
+          print(e); // OK
+        }
       }
     }
     return null;
@@ -1262,9 +1279,8 @@ class AppsProvider with ChangeNotifier {
       await Future.delayed(const Duration(microseconds: 1));
     }
     for (App a in importedApps) {
-      if (apps[a.id]?.app.installedVersion != null) {
-        a.installedVersion = apps[a.id]?.app.installedVersion;
-      }
+      a.installedVersion =
+          (await getInstalledInfo(a.id, printErr: false))?.versionName;
     }
     await saveApps(importedApps, onlyIfExists: false);
     notifyListeners();

lib/providers/settings_provider.dart

@@ -437,4 +437,13 @@ class SettingsProvider with ChangeNotifier {
     prefs?.setBool('exportSettings', val);
     notifyListeners();
   }
+
+  bool get parallelDownloads {
+    return prefs?.getBool('parallelDownloads') ?? false;
+  }
+
+  set parallelDownloads(bool val) {
+    prefs?.setBool('parallelDownloads', val);
+    notifyListeners();
+  }
 }