Merge pull request #1188 from ImranR98/dev

Typo, minor error reporting bug
ImranR98 · Dec 25, 2023 · 45fa0a1 · 45fa0a1
2 parents c972401 + 0e5c07a
commit 45fa0a1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/lib/app_sources/html.dart b/lib/app_sources/html.dart
@@ -95,7 +95,7 @@ class HTML extends AppSource {
             label: tr('sortByFileNamesNotLinks'))
       ],
       [GeneratedFormSwitch('skipSort', label: tr('skipSort'))],
-      [GeneratedFormSwitch('reverseSort', label: tr('takeTopLink'))],
+      [GeneratedFormSwitch('reverseSort', label: tr('takeFirstLink'))],
       [
         GeneratedFormSwitch('supportFixedAPKURL',
             defaultValue: true, label: tr('supportFixedAPKURL')),

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

diff --git a/lib/providers/apps_provider.dart b/lib/providers/apps_provider.dart
@@ -520,11 +520,17 @@ class AppsProvider with ChangeNotifier {
     int? code;
     switch (settingsProvider.installMethod) {
       case InstallMethodSettings.normal:
-        code = await AndroidPackageInstaller.installApk(apkFilePath: file.file.path);
+        code = await AndroidPackageInstaller.installApk(
+            apkFilePath: file.file.path);
       case InstallMethodSettings.shizuku:
-        code = (await Installers.installWithShizuku(apkFileUri: file.file.uri.toString())) ? 0 : 1;
+        code = (await Installers.installWithShizuku(
+                apkFileUri: file.file.uri.toString()))
+            ? 0
+            : 1;
       case InstallMethodSettings.root:
-        code = (await Installers.installWithRoot(apkFilePath: file.file.path)) ? 0 : 1;
+        code = (await Installers.installWithRoot(apkFilePath: file.file.path))
+            ? 0
+            : 1;
     }
     bool installed = false;
     if (code != null && code != 0 && code != 3) {
@@ -683,7 +689,8 @@ class AppsProvider with ChangeNotifier {
         bool willBeSilent = await canInstallSilently(apps[appId]!.app);
         switch (settingsProvider.installMethod) {
           case InstallMethodSettings.normal:
-            if (!(await settingsProvider.getInstallPermission(enforce: false))) {
+            if (!(await settingsProvider.getInstallPermission(
+                enforce: false))) {
               throw ObtainiumError(tr('cancelled'));
             }
           case InstallMethodSettings.shizuku:
@@ -743,7 +750,9 @@ class AppsProvider with ChangeNotifier {
       await Future.wait(
           appsToInstall.map((id) => updateFn(id, skipInstalls: true)));
       for (var id in appsToInstall) {
-        await updateFn(id);
+        if (!errors.appIdNames.containsKey(id)) {
+          await updateFn(id);
+        }
       }
     }
 

diff --git 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.40+234 # When changing this, update the tag in main() accordingly
+version: 0.14.41+235 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=3.0.0 <4.0.0'