From 6275cbf1146e6b811f3aea97a2f0304269c80dfb Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Wed, 12 Apr 2023 14:50:54 -0400 Subject: [PATCH 1/5] HTML Source - handle relative URLs in literal .html pages --- lib/app_sources/html.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/app_sources/html.dart b/lib/app_sources/html.dart index bf4203e..92ddc9d 100644 --- a/lib/app_sources/html.dart +++ b/lib/app_sources/html.dart @@ -40,7 +40,9 @@ class HTML extends AppSource { ? e : e.startsWith('/') ? '${uri.origin}/$e' - : '${uri.origin}/${uri.path}/$e') + : uri.path.endsWith('.html') || uri.path.endsWith('.php') + ? '${uri.origin}/${uri.path.split('/').sublist(0, uri.path.split('/').length - 1).join('/')}/$e' + : '${uri.origin}/${uri.path}/$e') .toList(); return APKDetails( version, getApkUrlsFromUrls(apkUrls), AppNames(uri.host, tr('app'))); From 0704dfe2ee0be9dca04c74a629fd1b64c9972c78 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Wed, 12 Apr 2023 15:17:08 -0400 Subject: [PATCH 2/5] Fixed relative link handling in HTML source --- lib/app_sources/html.dart | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/app_sources/html.dart b/lib/app_sources/html.dart index 92ddc9d..92178bf 100644 --- a/lib/app_sources/html.dart +++ b/lib/app_sources/html.dart @@ -34,16 +34,20 @@ class HTML extends AppSource { var rel = links.last; var apkName = rel.split('/').last; var version = apkName.substring(0, apkName.length - 4); - List apkUrls = [rel] - .map((e) => e.toLowerCase().startsWith('http://') || - e.toLowerCase().startsWith('https://') - ? e - : e.startsWith('/') - ? '${uri.origin}/$e' - : uri.path.endsWith('.html') || uri.path.endsWith('.php') - ? '${uri.origin}/${uri.path.split('/').sublist(0, uri.path.split('/').length - 1).join('/')}/$e' - : '${uri.origin}/${uri.path}/$e') - .toList(); + List apkUrls = [rel].map((e) { + try { + Uri.parse(e).origin; + return e; + } catch (err) { + // is relative + } + var currPathSegments = uri.path.split('/'); + if (e.startsWith('/') || currPathSegments.isEmpty) { + return '${uri.origin}/$e'; + } else { + return '${uri.origin}/${currPathSegments.sublist(0, currPathSegments.length - 1).join('/')}/$e'; + } + }).toList(); return APKDetails( version, getApkUrlsFromUrls(apkUrls), AppNames(uri.host, tr('app'))); } else { From 7ea75325bb2124d4da0a9a3945bf0c199f43a56d Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Wed, 12 Apr 2023 15:36:17 -0400 Subject: [PATCH 3/5] App name overrides more consistent (#450) --- lib/pages/app.dart | 4 ++-- lib/pages/apps.dart | 12 ++++-------- lib/providers/apps_provider.dart | 15 +++++++-------- lib/providers/notifications_provider.dart | 8 ++++---- lib/providers/source_provider.dart | 9 +++++++++ 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/lib/pages/app.dart b/lib/pages/app.dart index bd9e510..815b6dc 100644 --- a/lib/pages/app.dart +++ b/lib/pages/app.dart @@ -153,7 +153,7 @@ class _AppPageState extends State { height: 25, ), Text( - app?.app.name ?? tr('app'), + app?.name ?? tr('app'), textAlign: TextAlign.center, style: Theme.of(context).textTheme.displayLarge, ), @@ -386,7 +386,7 @@ class _AppPageState extends State { scrollable: true, content: getInfoColumn(), title: Text( - '${app.app.name} ${tr('byX', args: [ + '${app.name} ${tr('byX', args: [ app.app.author ])}'), actions: [ diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart index 201df76..be6cd50 100644 --- a/lib/pages/apps.dart +++ b/lib/pages/apps.dart @@ -94,8 +94,7 @@ class AppsPageState extends State { .toList(); for (var t in nameTokens) { - var name = app.installedInfo?.name ?? app.app.name; - if (!name.toLowerCase().contains(t.toLowerCase())) { + if (!app.name.toLowerCase().contains(t.toLowerCase())) { return false; } } @@ -120,13 +119,11 @@ class AppsPageState extends State { }).toList(); listedApps.sort((a, b) { - var nameA = a.installedInfo?.name ?? a.app.name; - var nameB = b.installedInfo?.name ?? b.app.name; int result = 0; if (settingsProvider.sortColumn == SortColumnSettings.authorName) { - result = (a.app.author + nameA).compareTo(b.app.author + nameB); + result = (a.app.author + a.name).compareTo(b.app.author + b.name); } else if (settingsProvider.sortColumn == SortColumnSettings.nameAuthor) { - result = (nameA + a.app.author).compareTo(nameB + b.app.author); + result = (a.name + a.app.author).compareTo(b.name + b.app.author); } else if (settingsProvider.sortColumn == SortColumnSettings.releaseDate) { result = (a.app.releaseDate)?.compareTo( @@ -481,8 +478,7 @@ class AppsPageState extends State { leading: getAppIcon(index), title: Text( maxLines: 1, - listedApps[index].installedInfo?.name ?? - listedApps[index].app.name, + listedApps[index].name, style: TextStyle( overflow: TextOverflow.ellipsis, fontWeight: listedApps[index].app.pinned diff --git a/lib/providers/apps_provider.dart b/lib/providers/apps_provider.dart index 13fa426..22e08cc 100644 --- a/lib/providers/apps_provider.dart +++ b/lib/providers/apps_provider.dart @@ -36,6 +36,8 @@ class AppInMemory { AppInMemory(this.app, this.downloadProgress, this.installedInfo); AppInMemory deepCopy() => AppInMemory(app.deepCopy(), downloadProgress, installedInfo); + + String get name => app.overrideName ?? installedInfo?.name ?? app.finalName; } class DownloadedApk { @@ -163,7 +165,7 @@ class AppsProvider with ChangeNotifier { Future downloadApp(App app, BuildContext? context) async { NotificationsProvider? notificationsProvider = context?.read(); - var notifId = DownloadNotification(app.name, 0).id; + var notifId = DownloadNotification(app.finalName, 0).id; if (apps[app.id] != null) { apps[app.id]!.downloadProgress = 0; notifyListeners(); @@ -173,7 +175,7 @@ class AppsProvider with ChangeNotifier { .getSource(app.url) .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex].value); var fileName = '${app.id}-${downloadUrl.hashCode}.apk'; - var notif = DownloadNotification(app.name, 100); + var notif = DownloadNotification(app.finalName, 100); notificationsProvider?.cancel(notif.id); int? prevProg; File downloadedFile = @@ -183,7 +185,7 @@ class AppsProvider with ChangeNotifier { apps[app.id]!.downloadProgress = progress; notifyListeners(); } - notif = DownloadNotification(app.name, prog ?? 100); + notif = DownloadNotification(app.finalName, prog ?? 100); if (prog != null && prevProg != prog) { notificationsProvider?.notify(notif); } @@ -641,7 +643,7 @@ class AppsProvider with ChangeNotifier { sp.getSource(newApps[i].url); apps[newApps[i].id] = AppInMemory(newApps[i], null, info); } catch (e) { - errors.add([newApps[i].id, newApps[i].name, e.toString()]); + errors.add([newApps[i].id, newApps[i].finalName, e.toString()]); } } if (errors.isNotEmpty) { @@ -675,9 +677,6 @@ class AppsProvider with ChangeNotifier { var app = a.deepCopy(); AppInfo? info = await getInstalledInfo(app.id); app.name = info?.name ?? app.name; - if (app.additionalSettings['appName']?.toString().isNotEmpty == true) { - app.name = app.additionalSettings['appName'].toString().trim(); - } if (attemptToCorrectInstallStatus) { app = getCorrectedInstallStatusAppIfPossible(app, info) ?? app; } @@ -945,7 +944,7 @@ class _APKPickerState extends State { scrollable: true, title: Text(tr('pickAnAPK')), content: Column(children: [ - Text(tr('appHasMoreThanOnePackage', args: [widget.app.name])), + Text(tr('appHasMoreThanOnePackage', args: [widget.app.finalName])), const SizedBox(height: 16), ...widget.app.apkUrls.map( (u) => RadioListTile( diff --git a/lib/providers/notifications_provider.dart b/lib/providers/notifications_provider.dart index b68a669..f48b09a 100644 --- a/lib/providers/notifications_provider.dart +++ b/lib/providers/notifications_provider.dart @@ -34,9 +34,9 @@ class UpdateNotification extends ObtainiumNotification { message = updates.isEmpty ? tr('noNewUpdates') : updates.length == 1 - ? tr('xHasAnUpdate', args: [updates[0].name]) + ? tr('xHasAnUpdate', args: [updates[0].finalName]) : plural('xAndNMoreUpdatesAvailable', updates.length - 1, - args: [updates[0].name, (updates.length - 1).toString()]); + args: [updates[0].finalName, (updates.length - 1).toString()]); } } @@ -46,9 +46,9 @@ class SilentUpdateNotification extends ObtainiumNotification { tr('appsUpdatedNotifDescription'), Importance.defaultImportance) { message = updates.length == 1 ? tr('xWasUpdatedToY', - args: [updates[0].name, updates[0].latestVersion]) + args: [updates[0].finalName, updates[0].latestVersion]) : plural('xAndNMoreUpdatesInstalled', updates.length - 1, - args: [updates[0].name, (updates.length - 1).toString()]); + args: [updates[0].finalName, (updates.length - 1).toString()]); } } diff --git a/lib/providers/source_provider.dart b/lib/providers/source_provider.dart index 5e8f595..24449d4 100644 --- a/lib/providers/source_provider.dart +++ b/lib/providers/source_provider.dart @@ -80,6 +80,15 @@ class App { return 'ID: $id URL: $url INSTALLED: $installedVersion LATEST: $latestVersion APK: $apkUrls PREFERREDAPK: $preferredApkIndex ADDITIONALSETTINGS: ${additionalSettings.toString()} LASTCHECK: ${lastUpdateCheck.toString()} PINNED $pinned'; } + String? get overrideName => + additionalSettings['appName']?.toString().trim().isNotEmpty == true + ? additionalSettings['appName'] + : null; + + String get finalName { + return overrideName ?? name; + } + App deepCopy() => App( id, url, From df242b91ad3ae51ede57898027236aa8371e25ad Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Wed, 12 Apr 2023 15:39:32 -0400 Subject: [PATCH 4/5] Increment version, update packages --- lib/main.dart | 2 +- pubspec.lock | 64 +++++++++++++++++++++++++-------------------------- pubspec.yaml | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 3ce2b61..d11d07d 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.29'; +const String currentVersion = '0.11.30'; const String currentReleaseTag = 'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES diff --git a/pubspec.lock b/pubspec.lock index 6510e6f..2bc0b23 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: "direct main" description: name: android_alarm_manager_plus - sha256: "8647cc5f9339f3955a2bd9ec40e0f10c3a80049f31f80b3ffdd87e07bb73fce2" + sha256: f6d0347734fa2ea716349a5a3e16ffdc1800ca64e5640112896d128c6815c178 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" android_intent_plus: dependency: "direct main" description: name: android_intent_plus - sha256: "54810cb33945c2c10742cd746ea994822c115e9dbe189919bc63cb436e45a6af" + sha256: "6bcdcd20461ac7a0c785f6298cdda96ad275d5bcbc1ecf28829cbe03ec6690be" url: "https://pub.dev" source: hosted - version: "3.1.6" + version: "3.1.7" animations: dependency: "direct main" description: @@ -117,10 +117,10 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: "1d6e5a61674ba3a68fb048a7c7b4ff4bebfed8d7379dbe8f2b718231be9a7c95" + sha256: "435383ca05f212760b0a70426b5a90354fe6bd65992b3a5e27ab6ede74c02f5c" url: "https://pub.dev" source: hosted - version: "8.1.0" + version: "8.2.0" device_info_plus_platform_interface: dependency: transitive description: @@ -133,10 +133,10 @@ packages: dependency: "direct main" description: name: dynamic_color - sha256: c4a508284b14ec4dda5adba2c28b2cdd34fbae1afead7e8c52cad87d51c5405b + sha256: bbebb1b7ebed819e0ec83d4abdc2a8482d934f6a85289ffc1c6acf7589fa2aad url: "https://pub.dev" source: hosted - version: "1.6.2" + version: "1.6.3" easy_localization: dependency: "direct main" description: @@ -181,10 +181,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: d8e9ca7e5d1983365c277f12c21b4362df6cf659c99af146ad4d04eb33033013 + sha256: dd328189f2f4ccea042bb5b382d5e981691cc74b5a3429b9317bff2b19704489 url: "https://pub.dev" source: hosted - version: "5.2.6" + version: "5.2.8" flutter: dependency: "direct main" description: flutter @@ -425,10 +425,10 @@ packages: dependency: transitive description: name: path_provider_foundation - sha256: "818b2dc38b0f178e0ea3f7cf3b28146faab11375985d815942a68eee11c2d0f7" + sha256: ad4c4d011830462633f03eb34445a45345673dfd4faf1ab0b4735fbd93b19183 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" path_provider_linux: dependency: transitive description: @@ -537,18 +537,18 @@ packages: dependency: "direct main" description: name: share_plus - sha256: "8c6892037b1824e2d7e8f59d54b3105932899008642e6372e5079c6939b4b625" + sha256: "692261968a494e47323dcc8bc66d8d52e81bc27cb4b808e4e8d7e8079d4cc01a" url: "https://pub.dev" source: hosted - version: "6.3.1" + version: "6.3.2" share_plus_platform_interface: dependency: transitive description: name: share_plus_platform_interface - sha256: "82ddd4ab9260c295e6e39612d4ff00390b9a7a21f1bb1da771e2f232d80ab8a1" + sha256: "0c6e61471bd71b04a138b8b588fa388e66d8b005e6f2deda63371c5c505a0981" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" shared_preferences: dependency: "direct main" description: @@ -569,10 +569,10 @@ packages: dependency: transitive description: name: shared_preferences_foundation - sha256: cf2a42fb20148502022861f71698db12d937c7459345a1bdaa88fc91a91b3603 + sha256: "0c1c16c56c9708aa9c361541a6f0e5cc6fc12a3232d866a687a7b7db30032b07" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" shared_preferences_linux: dependency: transitive description: @@ -710,18 +710,18 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: dd729390aa936bf1bdf5cd1bc7468ff340263f80a2c4f569416507667de8e3c8 + sha256: a52628068d282d01a07cd86e6ba99e497aa45ce8c91159015b2416907d78e411 url: "https://pub.dev" source: hosted - version: "6.0.26" + version: "6.0.27" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "3dedc66ca3c0bef9e6a93c0999aee102556a450afcc1b7bcfeace7a424927d92" + sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2" url: "https://pub.dev" source: hosted - version: "6.1.3" + version: "6.1.4" url_launcher_linux: dependency: transitive description: @@ -734,10 +734,10 @@ packages: dependency: transitive description: name: url_launcher_macos - sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a" + sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e" url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "3.0.5" url_launcher_platform_interface: dependency: transitive description: @@ -790,34 +790,34 @@ packages: dependency: transitive description: name: webview_flutter_android - sha256: "9e223788e1954087dac30d813dc151f8e12f09f1139f116ce20b5658893f3627" + sha256: "5906c9aa8c88ed372b2ad3c88c942790b4fb16f73fdd1c0647b4d747d9cf5b3f" url: "https://pub.dev" source: hosted - version: "3.4.4" + version: "3.4.5" webview_flutter_platform_interface: dependency: transitive description: name: webview_flutter_platform_interface - sha256: "1939c39e2150fb4d30fd3cc59a891a49fed9935db53007df633ed83581b6117b" + sha256: "6341f92977609be71391f4d4dcd64bfaa8ac657af1dfb2e231b5c1724e8c6c36" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.2.0" webview_flutter_wkwebview: dependency: transitive description: name: webview_flutter_wkwebview - sha256: d601aba11ad8d4481e17a34a76fa1d30dee92dcbbe2c58b0df3120e9453099c7 + sha256: "9a78d963cce191dd6a9df547301fc5c008bf3dae95a323ec281fff1284e0a037" url: "https://pub.dev" source: hosted - version: "3.2.3" + version: "3.2.4" win32: dependency: transitive description: name: win32 - sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46 + sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4 url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.1.4" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 9c5f555..129c962 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.29+151 # When changing this, update the tag in main() accordingly +version: 0.11.30+152 # When changing this, update the tag in main() accordingly environment: sdk: '>=2.18.2 <3.0.0' From 6a1275e9e421f93c28390348fba25aafad120fcd Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Wed, 12 Apr 2023 15:46:48 -0400 Subject: [PATCH 5/5] Sort no longer case-sensitive (#450) --- lib/pages/apps.dart | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart index be6cd50..44d16a1 100644 --- a/lib/pages/apps.dart +++ b/lib/pages/apps.dart @@ -121,9 +121,11 @@ class AppsPageState extends State { listedApps.sort((a, b) { int result = 0; if (settingsProvider.sortColumn == SortColumnSettings.authorName) { - result = (a.app.author + a.name).compareTo(b.app.author + b.name); + result = ((a.app.author + a.name).toLowerCase()) + .compareTo((b.app.author + b.name).toLowerCase()); } else if (settingsProvider.sortColumn == SortColumnSettings.nameAuthor) { - result = (a.name + a.app.author).compareTo(b.name + b.app.author); + result = ((a.name + a.app.author).toLowerCase()) + .compareTo((b.name + b.app.author).toLowerCase()); } else if (settingsProvider.sortColumn == SortColumnSettings.releaseDate) { result = (a.app.releaseDate)?.compareTo( @@ -203,7 +205,7 @@ class AppsPageState extends State { var listedCategories = getListedCategories(); listedCategories.sort((a, b) { return a != null && b != null - ? a.compareTo(b) + ? a.toLowerCase().compareTo(b.toLowerCase()) : a == null ? 1 : -1;