Merge branch 'main' into re7gog

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();
+  }
 }