From 3ea8dc598c33ecadd8b4acc816757ee97bbe81cd Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sat, 23 Sep 2023 17:18:12 -0400 Subject: [PATCH] Downgrade permission handler to fix #932 + APKPure improvement --- lib/app_sources/apkpure.dart | 6 ++++-- lib/main.dart | 2 +- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/app_sources/apkpure.dart b/lib/app_sources/apkpure.dart index b40d39f..d22e9a6 100644 --- a/lib/app_sources/apkpure.dart +++ b/lib/app_sources/apkpure.dart @@ -26,12 +26,14 @@ class APKPure extends AppSource { @override String sourceSpecificStandardizeURL(String url) { - RegExp standardUrlRegExB = RegExp('^https?://m.$host/+[^/]+/+[^/]+'); + RegExp standardUrlRegExB = + RegExp('^https?://m.$host/+[^/]+/+[^/]+(/+[^/]+)?'); RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase()); if (match != null) { url = 'https://$host${Uri.parse(url).path}'; } - RegExp standardUrlRegExA = RegExp('^https?://$host/+[^/]+/+[^/]+'); + RegExp standardUrlRegExA = + RegExp('^https?://$host/+[^/]+/+[^/]+(/+[^/]+)?'); match = standardUrlRegExA.firstMatch(url.toLowerCase()); if (match == null) { throw InvalidURLError(name); diff --git a/lib/main.dart b/lib/main.dart index a1b8837..114dae6 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.19'; +const String currentVersion = '0.14.20'; const String currentReleaseTag = 'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES diff --git a/pubspec.lock b/pubspec.lock index a027ead..fc2bdb5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -546,10 +546,10 @@ packages: dependency: transitive description: name: permission_handler_android - sha256: f2543a236584a5e8be79076f858022f100ce690e31530e6fa4c32ac94f276d3a + sha256: f23cfe9af0d49c6b9fd8a8b09f7b3301ca7e346204939b5afef4404d36d2608f url: "https://pub.dev" source: hosted - version: "11.0.3" + version: "11.0.1" permission_handler_apple: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 1a1b034..17d8771 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.19+211 # When changing this, update the tag in main() accordingly +version: 0.14.20+212 # When changing this, update the tag in main() accordingly environment: sdk: '>=3.0.0 <4.0.0'