From 1fb68dd6745f5efb4e1312ea7ef28c8441d9c3f7 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sat, 7 Jan 2023 16:18:26 -0500 Subject: [PATCH 1/3] GitHub release filter bugfix --- lib/app_sources/github.dart | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/app_sources/github.dart b/lib/app_sources/github.dart index 910eb61..84d6599 100644 --- a/lib/app_sources/github.dart +++ b/lib/app_sources/github.dart @@ -141,10 +141,13 @@ class GitHub extends AppSource { if (!includePrereleases && releases[i]['prerelease'] == true) { continue; } - + var nameToFilter = releases[i]['name'] as String; + if (nameToFilter.trim().isEmpty) { + // Some leave titles empty so tag is used + nameToFilter = releases[i]['tag_name'] as String; + } if (regexFilter != null && - !RegExp(regexFilter) - .hasMatch((releases[i]['name'] as String).trim())) { + !RegExp(regexFilter).hasMatch(nameToFilter.trim())) { continue; } var apkUrls = getReleaseAPKUrls(releases[i]); From e888fb712099ba2c1144b1b8eb0897c5a8b639e4 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sat, 7 Jan 2023 16:49:38 -0500 Subject: [PATCH 2/3] Don't skip installing same-versionCode updates --- lib/providers/apps_provider.dart | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/providers/apps_provider.dart b/lib/providers/apps_provider.dart index aa5c2fd..92be206 100644 --- a/lib/providers/apps_provider.dart +++ b/lib/providers/apps_provider.dart @@ -247,10 +247,7 @@ class AppsProvider with ChangeNotifier { !(await canDowngradeApps())) { throw DowngradeError(); } - if (appInfo == null || - int.parse(newInfo.buildNumber) > appInfo.versionCode!) { - await InstallPlugin.installApk(file.file.path, 'dev.imranr.obtainium'); - } + await InstallPlugin.installApk(file.file.path, 'dev.imranr.obtainium'); apps[file.appId]!.app.installedVersion = apps[file.appId]!.app.latestVersion; // Don't correct install status as installation may not be done yet From 768213cb34d07a486424f416247453b1702e4663 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sat, 7 Jan 2023 16:50:01 -0500 Subject: [PATCH 3/3] 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 e48163b..04b4add 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart'; // ignore: implementation_imports import 'package:easy_localization/src/localization.dart'; -const String currentVersion = '0.9.14'; +const String currentVersion = '0.9.15'; const String currentReleaseTag = 'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES diff --git a/pubspec.yaml b/pubspec.yaml index 96f8173..4fd1542 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.9.14+104 # When changing this, update the tag in main() accordingly +version: 0.9.15+105 # When changing this, update the tag in main() accordingly environment: sdk: '>=2.18.2 <3.0.0'