From 1b2a9a39e301713ff73be8dc02cc17bd3058747a Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Wed, 19 Apr 2023 02:05:31 -0400 Subject: [PATCH 1/9] Fix "reset install status" button being disabled --- lib/pages/apps.dart | 46 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart index 44d16a1..8d56aea 100644 --- a/lib/pages/apps.dart +++ b/lib/pages/apps.dart @@ -754,30 +754,28 @@ class AppsPageState extends State { Navigator.of(context).pop(); } - resetSelectedAppsInstallStatuses() { - () async { - try { - var values = await showDialog( - context: context, - builder: (BuildContext ctx) { - return GeneratedFormModal( - title: tr('resetInstallStatusForSelectedAppsQuestion'), - items: const [], - initValid: true, - message: tr('installStatusOfXWillBeResetExplanation', - args: [plural('app', selectedAppIds.length)]), - ); - }); - if (values != null) { - appsProvider.saveApps(selectedApps.map((e) { - e.installedVersion = null; - return e; - }).toList()); - } - } finally { - Navigator.of(context).pop(); + resetSelectedAppsInstallStatuses() async { + try { + var values = await showDialog( + context: context, + builder: (BuildContext ctx) { + return GeneratedFormModal( + title: tr('resetInstallStatusForSelectedAppsQuestion'), + items: const [], + initValid: true, + message: tr('installStatusOfXWillBeResetExplanation', + args: [plural('app', selectedAppIds.length)]), + ); + }); + if (values != null) { + appsProvider.saveApps(selectedApps.map((e) { + e.installedVersion = null; + return e; + }).toList()); } - }; + } finally { + Navigator.of(context).pop(); + } } showMoreOptionsDialog() { @@ -825,7 +823,7 @@ class AppsPageState extends State { icon: const Icon(Icons.share), ), IconButton( - onPressed: resetSelectedAppsInstallStatuses(), + onPressed: resetSelectedAppsInstallStatuses, tooltip: tr('resetInstallStatus'), icon: const Icon(Icons.restore_page_outlined), ), From 78141998f48a45c31048ade1b07f5aafe33dc1dd Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Fri, 21 Apr 2023 15:54:17 -0400 Subject: [PATCH 2/9] Attempt additional fix for #201 --- lib/pages/add_app.dart | 3 ++- lib/providers/apps_provider.dart | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/pages/add_app.dart b/lib/pages/add_app.dart index f4f6c0e..27d37c2 100644 --- a/lib/pages/add_app.dart +++ b/lib/pages/add_app.dart @@ -127,7 +127,8 @@ class _AddAppPageState extends State { if (apkUrl == null) { throw ObtainiumError(tr('cancelled')); } - app.preferredApkIndex = app.apkUrls.indexOf(apkUrl); + app.preferredApkIndex = + app.apkUrls.map((e) => e.value).toList().indexOf(apkUrl.value); // ignore: use_build_context_synchronously var downloadedApk = await appsProvider.downloadApp( app, globalNavigatorKey.currentContext); diff --git a/lib/providers/apps_provider.dart b/lib/providers/apps_provider.dart index 22e08cc..aa6719b 100644 --- a/lib/providers/apps_provider.dart +++ b/lib/providers/apps_provider.dart @@ -304,7 +304,8 @@ class AppsProvider with ChangeNotifier { Future?> confirmApkUrl( App app, BuildContext? context) async { // If the App has more than one APK, the user should pick one (if context provided) - MapEntry? apkUrl = app.apkUrls[app.preferredApkIndex]; + MapEntry? apkUrl = + app.apkUrls[app.preferredApkIndex >= 0 ? app.preferredApkIndex : 0]; // get device supported architecture List archs = (await DeviceInfoPlugin().androidInfo).supportedAbis; @@ -365,8 +366,13 @@ class AppsProvider with ChangeNotifier { apkUrl = await confirmApkUrl(apps[id]!.app, context); } if (apkUrl != null) { - int urlInd = apps[id]!.app.apkUrls.indexOf(apkUrl); - if (urlInd != apps[id]!.app.preferredApkIndex) { + int urlInd = apps[id]! + .app + .apkUrls + .map((e) => e.value) + .toList() + .indexOf(apkUrl.value); + if (urlInd >= 0 && urlInd != apps[id]!.app.preferredApkIndex) { apps[id]!.app.preferredApkIndex = urlInd; await saveApps([apps[id]!.app]); } From 9f2db4e4e7fbae7f8617063e687ff9cce255bfc9 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sat, 22 Apr 2023 21:40:15 -0400 Subject: [PATCH 3/9] App page 'reset install status' button shows if appropriate --- lib/pages/app.dart | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/pages/app.dart b/lib/pages/app.dart index 815b6dc..2b40cdd 100644 --- a/lib/pages/app.dart +++ b/lib/pages/app.dart @@ -268,9 +268,7 @@ class _AppPageState extends State { }).toList(); return GeneratedFormModal( - title: tr('additionalOptions'), - items: items, - ); + title: tr('additionalOptions'), items: items); }); } @@ -307,6 +305,15 @@ class _AppPageState extends State { } } + getResetInstallStatusButton() => TextButton( + onPressed: app?.app == null + ? null + : () { + app!.app.installedVersion = null; + appsProvider.saveApps([app.app]); + }, + child: Text(tr('resetInstallStatus'))); + getInstallOrUpdateButton() => TextButton( onPressed: (app?.app.installedVersion == null || app?.app.installedVersion != app?.app.latestVersion) && @@ -402,7 +409,13 @@ class _AppPageState extends State { icon: const Icon(Icons.more_horiz), tooltip: tr('more')), const SizedBox(width: 16.0), - Expanded(child: getInstallOrUpdateButton()), + Expanded( + child: !isVersionDetectionStandard && + app?.app.installedVersion != null && + app?.app.installedVersion == + app?.app.latestVersion + ? getResetInstallStatusButton() + : getInstallOrUpdateButton()), const SizedBox(width: 16.0), Expanded( child: TextButton( From 3e732a4317ffbcb8add22b983bbb4f3de7f74b63 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sat, 22 Apr 2023 22:42:59 -0400 Subject: [PATCH 4/9] Sort GitHub releases by date, remove codeberg redundancy --- lib/app_sources/codeberg.dart | 100 ++++------------------------------ lib/app_sources/github.dart | 91 +++++++++++++++++++++++-------- 2 files changed, 79 insertions(+), 112 deletions(-) diff --git a/lib/app_sources/codeberg.dart b/lib/app_sources/codeberg.dart index 5787485..dc71fd6 100644 --- a/lib/app_sources/codeberg.dart +++ b/lib/app_sources/codeberg.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:easy_localization/easy_localization.dart'; import 'package:http/http.dart'; +import 'package:obtainium/app_sources/github.dart'; import 'package:obtainium/components/generated_form.dart'; import 'package:obtainium/custom_errors.dart'; import 'package:obtainium/providers/source_provider.dart'; @@ -35,6 +36,8 @@ class Codeberg extends AppSource { canSearch = true; } + var gh = GitHub(); + @override String standardizeURL(String url) { RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+'); @@ -54,80 +57,10 @@ class Codeberg extends AppSource { String standardUrl, Map additionalSettings, ) async { - bool includePrereleases = additionalSettings['includePrereleases'] == true; - bool fallbackToOlderReleases = - additionalSettings['fallbackToOlderReleases'] == true; - String? regexFilter = - (additionalSettings['filterReleaseTitlesByRegEx'] as String?) - ?.isNotEmpty == - true - ? additionalSettings['filterReleaseTitlesByRegEx'] - : null; - Response res = await get(Uri.parse( - 'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100')); - if (res.statusCode == 200) { - var releases = jsonDecode(res.body) as List; - - List> getReleaseAPKUrls(dynamic release) => - (release['assets'] as List?) - ?.map((e) { - return e['name'] != null && e['browser_download_url'] != null - ? MapEntry(e['name'] as String, - e['browser_download_url'] as String) - : const MapEntry('', ''); - }) - .where((element) => element.key.toLowerCase().endsWith('.apk')) - .toList() ?? - []; - - dynamic targetRelease; - var prerrelsSkipped = 0; - for (int i = 0; i < releases.length; i++) { - if (!fallbackToOlderReleases && i > prerrelsSkipped) break; - if (!includePrereleases && releases[i]['prerelease'] == true) { - prerrelsSkipped++; - continue; - } - if (releases[i]['draft'] == true) { - // Draft releases not supported - } - var nameToFilter = releases[i]['name'] as String?; - if (nameToFilter == null || nameToFilter.trim().isEmpty) { - // Some leave titles empty so tag is used - nameToFilter = releases[i]['tag_name'] as String; - } - if (regexFilter != null && - !RegExp(regexFilter).hasMatch(nameToFilter.trim())) { - continue; - } - var apkUrls = getReleaseAPKUrls(releases[i]); - if (apkUrls.isEmpty && additionalSettings['trackOnly'] != true) { - continue; - } - targetRelease = releases[i]; - targetRelease['apkUrls'] = apkUrls; - break; - } - if (targetRelease == null) { - throw NoReleasesError(); - } - String? version = targetRelease['tag_name']; - DateTime? releaseDate = targetRelease['published_at'] != null - ? DateTime.parse(targetRelease['published_at']) - : null; - if (version == null) { - throw NoVersionError(); - } - var changeLog = targetRelease['body'].toString(); - return APKDetails( - version, - targetRelease['apkUrls'] as List>, - getAppNames(standardUrl), - releaseDate: releaseDate, - changeLog: changeLog.isEmpty ? null : changeLog); - } else { - throw getObtainiumHttpError(res); - } + return gh.getLatestAPKDetailsCommon( + 'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100', + standardUrl, + additionalSettings); } AppNames getAppNames(String standardUrl) { @@ -138,20 +71,9 @@ class Codeberg extends AppSource { @override Future> search(String query) async { - Response res = await get(Uri.parse( - 'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100')); - if (res.statusCode == 200) { - Map urlsWithDescriptions = {}; - for (var e in (jsonDecode(res.body)['data'] as List)) { - urlsWithDescriptions.addAll({ - e['html_url'] as String: e['description'] != null - ? e['description'] as String - : tr('noDescription') - }); - } - return urlsWithDescriptions; - } else { - throw getObtainiumHttpError(res); - } + return gh.searchCommon( + query, + 'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100', + 'data'); } } diff --git a/lib/app_sources/github.dart b/lib/app_sources/github.dart index 4741fd4..5b6f2cf 100644 --- a/lib/app_sources/github.dart +++ b/lib/app_sources/github.dart @@ -96,11 +96,9 @@ class GitHub extends AppSource { String? changeLogPageFromStandardUrl(String standardUrl) => '$standardUrl/releases'; - @override - Future getLatestAPKDetails( - String standardUrl, - Map additionalSettings, - ) async { + Future getLatestAPKDetailsCommon(String requestUrl, + String standardUrl, Map additionalSettings, + {Function(Response)? onHttpErrorCode}) async { bool includePrereleases = additionalSettings['includePrereleases'] == true; bool fallbackToOlderReleases = additionalSettings['fallbackToOlderReleases'] == true; @@ -110,22 +108,40 @@ class GitHub extends AppSource { true ? additionalSettings['filterReleaseTitlesByRegEx'] : null; - Response res = await get(Uri.parse( - 'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100')); + Response res = await get(Uri.parse(requestUrl)); if (res.statusCode == 200) { var releases = jsonDecode(res.body) as List; - List getReleaseAPKUrls(dynamic release) => + List> getReleaseAPKUrls(dynamic release) => (release['assets'] as List?) ?.map((e) { - return e['browser_download_url'] != null - ? e['browser_download_url'] as String - : ''; + return e['name'] != null && e['browser_download_url'] != null + ? MapEntry(e['name'] as String, + e['browser_download_url'] as String) + : const MapEntry('', ''); }) - .where((element) => element.toLowerCase().endsWith('.apk')) + .where((element) => element.key.toLowerCase().endsWith('.apk')) .toList() ?? []; + DateTime? getReleaseDateFromRelease(dynamic rel) => + rel?['published_at'] != null + ? DateTime.parse(rel['published_at']) + : null; + releases.sort((a, b) { + // See #478 + if (a == b) { + return 0; + } else if (a == null) { + return -1; + } else if (b == null) { + return 1; + } else { + return getReleaseDateFromRelease(a)! + .compareTo(getReleaseDateFromRelease(b)!); + } + }); + releases = releases.reversed.toList(); dynamic targetRelease; var prerrelsSkipped = 0; for (int i = 0; i < releases.length; i++) { @@ -134,6 +150,10 @@ class GitHub extends AppSource { prerrelsSkipped++; continue; } + if (releases[i]['draft'] == true) { + // Draft releases not supported + continue; + } var nameToFilter = releases[i]['name'] as String?; if (nameToFilter == null || nameToFilter.trim().isEmpty) { // Some leave titles empty so tag is used @@ -155,38 +175,51 @@ class GitHub extends AppSource { throw NoReleasesError(); } String? version = targetRelease['tag_name']; - DateTime? releaseDate = targetRelease['published_at'] != null - ? DateTime.parse(targetRelease['published_at']) - : null; + DateTime? releaseDate = getReleaseDateFromRelease(targetRelease); if (version == null) { throw NoVersionError(); } var changeLog = targetRelease['body'].toString(); return APKDetails( version, - getApkUrlsFromUrls(targetRelease['apkUrls'] as List), + targetRelease['apkUrls'] as List>, getAppNames(standardUrl), releaseDate: releaseDate, changeLog: changeLog.isEmpty ? null : changeLog); } else { - rateLimitErrorCheck(res); + if (onHttpErrorCode != null) { + onHttpErrorCode(res); + } throw getObtainiumHttpError(res); } } + @override + Future getLatestAPKDetails( + String standardUrl, + Map additionalSettings, + ) async { + return getLatestAPKDetailsCommon( + 'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100', + standardUrl, + additionalSettings, onHttpErrorCode: (Response res) { + rateLimitErrorCheck(res); + }); + } + AppNames getAppNames(String standardUrl) { String temp = standardUrl.substring(standardUrl.indexOf('://') + 3); List names = temp.substring(temp.indexOf('/') + 1).split('/'); return AppNames(names[0], names[1]); } - @override - Future> search(String query) async { - Response res = await get(Uri.parse( - 'https://${await getCredentialPrefixIfAny()}api.$host/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100')); + Future> searchCommon( + String query, String requestUrl, String rootProp, + {Function(Response)? onHttpErrorCode}) async { + Response res = await get(Uri.parse(requestUrl)); if (res.statusCode == 200) { Map urlsWithDescriptions = {}; - for (var e in (jsonDecode(res.body)['items'] as List)) { + for (var e in (jsonDecode(res.body)[rootProp] as List)) { urlsWithDescriptions.addAll({ e['html_url'] as String: ((e['archived'] == true ? '[ARCHIVED] ' : '') + @@ -197,11 +230,23 @@ class GitHub extends AppSource { } return urlsWithDescriptions; } else { - rateLimitErrorCheck(res); + if (onHttpErrorCode != null) { + onHttpErrorCode(res); + } throw getObtainiumHttpError(res); } } + @override + Future> search(String query) async { + return searchCommon( + query, + 'https://${await getCredentialPrefixIfAny()}api.$host/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100', + 'items', onHttpErrorCode: (Response res) { + rateLimitErrorCheck(res); + }); + } + rateLimitErrorCheck(Response res) { if (res.headers['x-ratelimit-remaining'] == '0') { throw RateLimitError( From be61220af40dca17449a8ab9b05b24d81018e64c Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sat, 22 Apr 2023 22:57:54 -0400 Subject: [PATCH 5/9] Show version in changelog dialog (#482) --- lib/pages/apps.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart index 8d56aea..2629bc9 100644 --- a/lib/pages/apps.dart +++ b/lib/pages/apps.dart @@ -224,6 +224,7 @@ class AppsPageState extends State { return GeneratedFormModal( title: tr('changes'), items: const [], + message: listedApps[index].app.latestVersion, additionalWidgets: [ changesUrl != null ? GestureDetector( From de2b7fa7a13ac2e46c188c5e059d2dabe36d2836 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sat, 22 Apr 2023 23:49:55 -0400 Subject: [PATCH 6/9] URL selection modal improvements (incl. #460) --- lib/pages/import_export.dart | 78 +++++++++++++++++++++--------- lib/providers/apps_provider.dart | 2 +- lib/providers/source_provider.dart | 7 ++- 3 files changed, 62 insertions(+), 25 deletions(-) diff --git a/lib/pages/import_export.dart b/lib/pages/import_export.dart index 3234919..d8fe3d2 100644 --- a/lib/pages/import_export.dart +++ b/lib/pages/import_export.dart @@ -506,7 +506,7 @@ class _UrlSelectionModalState extends State { widget.onlyOneSelectionAllowed ? tr('selectURL') : tr('selectURLs')), content: Column(children: [ ...urlWithDescriptionSelections.keys.map((urlWithD) { - select(bool? value) { + selectThis(bool? value) { setState(() { value ??= false; if (value! && widget.onlyOneSelectionAllowed) { @@ -517,11 +517,56 @@ class _UrlSelectionModalState extends State { }); } - return Row(children: [ + var urlLink = GestureDetector( + onTap: () { + launchUrlString(urlWithD.key, + mode: LaunchMode.externalApplication); + }, + child: Text( + Uri.parse(urlWithD.key).path.substring(1), + style: const TextStyle(decoration: TextDecoration.underline), + textAlign: TextAlign.start, + )); + + var descriptionText = Text( + urlWithD.value.length > 128 + ? '${urlWithD.value.substring(0, 128)}...' + : urlWithD.value, + style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12), + ); + + var selectedUrlsWithDs = urlWithDescriptionSelections.entries + .where((e) => e.value) + .toList(); + + var singleSelectTile = ListTile( + title: urlLink, + subtitle: GestureDetector( + onTap: () { + setState(() { + selectOnlyOne(urlWithD.key); + }); + }, + child: descriptionText, + ), + leading: Radio( + value: urlWithD.key, + groupValue: selectedUrlsWithDs.isEmpty + ? null + : selectedUrlsWithDs.first.key.key, + onChanged: (value) { + setState(() { + selectOnlyOne(urlWithD.key); + }); + }, + ), + ); + + var multiSelectTile = Row(children: [ Checkbox( value: urlWithDescriptionSelections[urlWithD], onChanged: (value) { - select(value); + selectThis(value); }), const SizedBox( width: 8, @@ -534,28 +579,13 @@ class _UrlSelectionModalState extends State { const SizedBox( height: 8, ), - GestureDetector( - onTap: () { - launchUrlString(urlWithD.key, - mode: LaunchMode.externalApplication); - }, - child: Text( - Uri.parse(urlWithD.key).path.substring(1), - style: - const TextStyle(decoration: TextDecoration.underline), - textAlign: TextAlign.start, - )), + urlLink, GestureDetector( onTap: () { - select(!(urlWithDescriptionSelections[urlWithD] ?? false)); + selectThis( + !(urlWithDescriptionSelections[urlWithD] ?? false)); }, - child: Text( - urlWithD.value.length > 128 - ? '${urlWithD.value.substring(0, 128)}...' - : urlWithD.value, - style: const TextStyle( - fontStyle: FontStyle.italic, fontSize: 12), - ), + child: descriptionText, ), const SizedBox( height: 8, @@ -563,6 +593,10 @@ class _UrlSelectionModalState extends State { ], )) ]); + + return widget.onlyOneSelectionAllowed + ? singleSelectTile + : multiSelectTile; }) ]), actions: [ diff --git a/lib/providers/apps_provider.dart b/lib/providers/apps_provider.dart index aa6719b..a5b6154 100644 --- a/lib/providers/apps_provider.dart +++ b/lib/providers/apps_provider.dart @@ -913,7 +913,7 @@ class AppsProvider with ChangeNotifier { Future>> addAppsByURL(List urls) async { List results = await SourceProvider().getAppsByURLNaive(urls, - ignoreUrls: apps.values.map((e) => e.app.url).toList()); + alreadyAddedUrls: apps.values.map((e) => e.app.url).toList()); List pps = results[0]; Map errorsMap = results[1]; for (var app in pps) { diff --git a/lib/providers/source_provider.dart b/lib/providers/source_provider.dart index da871cd..8670216 100644 --- a/lib/providers/source_provider.dart +++ b/lib/providers/source_provider.dart @@ -519,11 +519,14 @@ class SourceProvider { // Returns errors in [results, errors] instead of throwing them Future> getAppsByURLNaive(List urls, - {List ignoreUrls = const []}) async { + {List alreadyAddedUrls = const []}) async { List apps = []; Map errors = {}; - for (var url in urls.where((element) => !ignoreUrls.contains(element))) { + for (var url in urls) { try { + if (alreadyAddedUrls.contains(url)) { + throw ObtainiumError(tr('appAlreadyAdded')); + } var source = getSource(url); apps.add(await getApp( source, From b406bb5c6ac9bfb2a8b6cca2323c3734e365cf1c Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sun, 23 Apr 2023 00:01:49 -0400 Subject: [PATCH 7/9] Increment version, update packages --- lib/main.dart | 2 +- pubspec.lock | 44 ++++++++++++++++++++++---------------------- pubspec.yaml | 4 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 32043e1..8b76e13 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.11.32'; +const String currentVersion = '0.11.33'; const String currentReleaseTag = 'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES diff --git a/pubspec.lock b/pubspec.lock index 115934a..71ed08d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -181,10 +181,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: dcde5ad1a0cebcf3715ea3f24d0db1888bf77027a26c77d7779e8ef63b8ade62 + sha256: b85eb92b175767fdaa0c543bf3b0d1f610fe966412ea72845fe5ba7801e763ff url: "https://pub.dev" source: hosted - version: "5.2.9" + version: "5.2.10" flutter: dependency: "direct main" description: flutter @@ -417,10 +417,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7" + sha256: da97262be945a72270513700a92b39dd2f4a54dad55d061687e2e37a6390366a url: "https://pub.dev" source: hosted - version: "2.0.24" + version: "2.0.25" path_provider_foundation: dependency: transitive description: @@ -561,10 +561,10 @@ packages: dependency: transitive description: name: shared_preferences_android - sha256: "1bc5d734b109c327b922b0891b41fc51483ccbd53c0d19952b7e230349a5d90b" + sha256: "7fa90471a6875d26ad78c7e4a675874b2043874586891128dc5899662c97db46" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" shared_preferences_foundation: dependency: transitive description: @@ -622,18 +622,18 @@ packages: dependency: "direct main" description: name: sqflite - sha256: "500d6fec583d2c021f2d25a056d96654f910662c64f836cd2063167b8f1fa758" + sha256: e7dfb6482d5d02b661d0b2399efa72b98909e5aa7b8336e1fb37e226264ade00 url: "https://pub.dev" source: hosted - version: "2.2.6" + version: "2.2.7" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "963dad8c4aa2f814ce7d2d5b1da2f36f31bd1a439d8f27e3dc189bb9d26bc684" + sha256: "220831bf0bd5333ff2445eee35ec131553b804e6b5d47a4a37ca6f5eb66e282c" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.4" stack_trace: dependency: transitive description: @@ -662,10 +662,10 @@ packages: dependency: transitive description: name: synchronized - sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b" + sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.0" term_glyph: dependency: transitive description: @@ -686,10 +686,10 @@ packages: dependency: transitive description: name: timezone - sha256: "24c8fcdd49a805d95777a39064862133ff816ebfffe0ceff110fb5960e557964" + sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0" url: "https://pub.dev" source: hosted - version: "0.9.1" + version: "0.9.2" typed_data: dependency: transitive description: @@ -782,34 +782,34 @@ packages: dependency: "direct main" description: name: webview_flutter - sha256: "47663d51a9061451aa3880a214ee9a65dcbb933b77bc44388e194279ab3ccaf6" + sha256: "1a37bdbaaf5fbe09ad8579ab09ecfd473284ce482f900b5aea27cf834386a567" url: "https://pub.dev" source: hosted - version: "4.0.7" + version: "4.2.0" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - sha256: bdd3ddbeaf341c75620e153d22b6f4f6c4a342fe4439ed3a10db74dd82e65d1c + sha256: "134ed5d36127b6f5865e86a82174886eae0b983dacd8df14b0448371debde755" url: "https://pub.dev" source: hosted - version: "3.5.1" + version: "3.6.0" webview_flutter_platform_interface: dependency: transitive description: name: webview_flutter_platform_interface - sha256: "6341f92977609be71391f4d4dcd64bfaa8ac657af1dfb2e231b5c1724e8c6c36" + sha256: "78715dc442b7849dbde74e92bb67de1cecf5addf95531c5fb474e72f5fe9a507" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.0" webview_flutter_wkwebview: dependency: transitive description: name: webview_flutter_wkwebview - sha256: "2ef3f65fd49061c18e4d837a411308f2850417f2d0a7c11aad2c3857bee12c18" + sha256: c94d242d8cbe1012c06ba7ac790c46d6e6b68723b7d34f8c74ed19f68d166f49 url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "3.4.0" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 59b8686..ea6682f 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.11.32+154 # When changing this, update the tag in main() accordingly +version: 0.11.33+155 # When changing this, update the tag in main() accordingly environment: sdk: '>=2.18.2 <3.0.0' @@ -49,7 +49,7 @@ dependencies: permission_handler: ^10.0.0 fluttertoast: ^8.0.9 device_info_plus: ^8.0.0 - file_picker: ^5.1.0 + file_picker: ^5.2.10 animations: ^2.0.4 install_plugin_v2: ^1.0.0 share_plus: ^6.0.1 From 283722319b554b0a284058f854ff1b88bc1d8825 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sun, 23 Apr 2023 00:53:03 -0400 Subject: [PATCH 8/9] More adaptive column spacing in apps list (#485) --- lib/pages/apps.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart index 2629bc9..6280c81 100644 --- a/lib/pages/apps.dart +++ b/lib/pages/apps.dart @@ -406,7 +406,8 @@ class AppsPageState extends State { children: [ Row(mainAxisSize: MainAxisSize.min, children: [ Container( - constraints: const BoxConstraints(maxWidth: 150), + constraints: BoxConstraints( + maxWidth: MediaQuery.of(context).size.width / 4), child: Text( getVersionText(index), overflow: TextOverflow.ellipsis, From e72b33ebf242b7c968d0e561dbbd64f950508cc6 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sun, 23 Apr 2023 01:19:31 -0400 Subject: [PATCH 9/9] Added fallback option to GitLab Source (#456) --- lib/app_sources/gitlab.dart | 84 ++++++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 29 deletions(-) diff --git a/lib/app_sources/gitlab.dart b/lib/app_sources/gitlab.dart index 7d813d7..5b8db8c 100644 --- a/lib/app_sources/gitlab.dart +++ b/lib/app_sources/gitlab.dart @@ -3,10 +3,19 @@ import 'package:http/http.dart'; import 'package:obtainium/app_sources/github.dart'; import 'package:obtainium/custom_errors.dart'; import 'package:obtainium/providers/source_provider.dart'; +import 'package:obtainium/components/generated_form.dart'; +import 'package:easy_localization/easy_localization.dart'; class GitLab extends AppSource { GitLab() { host = 'gitlab.com'; + + additionalSourceAppSpecificSettingFormItems = [ + [ + GeneratedFormSwitch('fallbackToOlderReleases', + label: tr('fallbackToOlderReleases'), defaultValue: true) + ] + ]; } @override @@ -28,41 +37,58 @@ class GitLab extends AppSource { String standardUrl, Map additionalSettings, ) async { + bool fallbackToOlderReleases = + additionalSettings['fallbackToOlderReleases'] == true; Response res = await get(Uri.parse('$standardUrl/-/tags?format=atom')); if (res.statusCode == 200) { var standardUri = Uri.parse(standardUrl); var parsedHtml = parse(res.body); - var entry = parsedHtml.querySelector('entry'); - var entryContent = - parse(parseFragment(entry?.querySelector('content')!.innerHtml).text); - var apkUrls = [ - ...getLinksFromParsedHTML( - entryContent, - RegExp( - '^${standardUri.path.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) { - return '\\${x[0]}'; - })}/uploads/[^/]+/[^/]+\\.apk\$', - caseSensitive: false), - standardUri.origin), - // GitLab releases may contain links to externally hosted APKs - ...getLinksFromParsedHTML(entryContent, - RegExp('/[^/]+\\.apk\$', caseSensitive: false), '') - .where((element) => Uri.parse(element).host != '') - .toList() - ]; + var apkDetailsList = parsedHtml.querySelectorAll('entry').map((entry) { + var entryContent = parse( + parseFragment(entry.querySelector('content')!.innerHtml).text); + var apkUrls = [ + ...getLinksFromParsedHTML( + entryContent, + RegExp( + '^${standardUri.path.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) { + return '\\${x[0]}'; + })}/uploads/[^/]+/[^/]+\\.apk\$', + caseSensitive: false), + standardUri.origin), + // GitLab releases may contain links to externally hosted APKs + ...getLinksFromParsedHTML(entryContent, + RegExp('/[^/]+\\.apk\$', caseSensitive: false), '') + .where((element) => Uri.parse(element).host != '') + .toList() + ]; - var entryId = entry?.querySelector('id')?.innerHtml; - var version = - entryId == null ? null : Uri.parse(entryId).pathSegments.last; - var releaseDateString = entry?.querySelector('updated')?.innerHtml; - DateTime? releaseDate = - releaseDateString != null ? DateTime.parse(releaseDateString) : null; - if (version == null) { - throw NoVersionError(); + var entryId = entry.querySelector('id')?.innerHtml; + var version = + entryId == null ? null : Uri.parse(entryId).pathSegments.last; + var releaseDateString = entry.querySelector('updated')?.innerHtml; + DateTime? releaseDate = releaseDateString != null + ? DateTime.parse(releaseDateString) + : null; + if (version == null) { + throw NoVersionError(); + } + return APKDetails(version, getApkUrlsFromUrls(apkUrls), + GitHub().getAppNames(standardUrl), + releaseDate: releaseDate); + }); + if (apkDetailsList.isEmpty) { + throw NoReleasesError(); } - return APKDetails(version, getApkUrlsFromUrls(apkUrls), - GitHub().getAppNames(standardUrl), - releaseDate: releaseDate); + if (fallbackToOlderReleases) { + if (additionalSettings['trackOnly'] != true) { + apkDetailsList = + apkDetailsList.where((e) => e.apkUrls.isNotEmpty).toList(); + } + if (apkDetailsList.isEmpty) { + throw NoReleasesError(); + } + } + return apkDetailsList.first; } else { throw getObtainiumHttpError(res); }