From bb859708bcbab7594af973c2bcc4a32b35e65a2d Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sun, 24 Dec 2023 21:14:18 -0500 Subject: [PATCH 1/3] Typo --- lib/app_sources/html.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/app_sources/html.dart b/lib/app_sources/html.dart index 81cb7ec..d0bcabd 100644 --- 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')), From 024e81cf01ffe869bbdaa78771e7263acd12b328 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sun, 24 Dec 2023 22:03:29 -0500 Subject: [PATCH 2/3] bug --- lib/providers/apps_provider.dart | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/providers/apps_provider.dart b/lib/providers/apps_provider.dart index 2669a0a..97e6118 100644 --- 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); + } } } From 0e5c07a0789b62ded39178aee185834f6d8b59d9 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sun, 24 Dec 2023 22:07:27 -0500 Subject: [PATCH 3/3] Update packages, increment version --- lib/main.dart | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index ebba088..21be97b 100644 --- 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/pubspec.yaml b/pubspec.yaml index d47a549..7b1bd76 100644 --- 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'