From 1a4ec3f0495f2fdfda0f0b6893917a3255b68153 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Fri, 24 Nov 2023 19:12:42 -0500 Subject: [PATCH] Add www support back to APKMirror (#1114) --- lib/app_sources/apkmirror.dart | 3 ++- lib/providers/source_provider.dart | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/app_sources/apkmirror.dart b/lib/app_sources/apkmirror.dart index 2265cc7..f1b903b 100644 --- a/lib/app_sources/apkmirror.dart +++ b/lib/app_sources/apkmirror.dart @@ -32,7 +32,8 @@ class APKMirror extends AppSource { @override String sourceSpecificStandardizeURL(String url) { - RegExp standardUrlRegEx = RegExp('^https?://$host/apk/[^/]+/[^/]+'); + RegExp standardUrlRegEx = + RegExp('^https?://(www\\.)?$host/apk/[^/]+/[^/]+'); RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); if (match == null) { throw InvalidURLError(name); diff --git a/lib/providers/source_provider.dart b/lib/providers/source_provider.dart index f31aa80..f098a39 100644 --- a/lib/providers/source_provider.dart +++ b/lib/providers/source_provider.dart @@ -596,7 +596,7 @@ class SourceProvider { AppSource? source; for (var s in sources.where((element) => element.host != null)) { if (RegExp( - '://(${s.allowSubDomains ? '([^\\.]+\\.)*' : ''}|www\\.)${s.host}(/|\\z)?') + '://${s.allowSubDomains ? '([^\\.]+\\.)*' : '(www\\.)?'}${s.host}(/|\\z)?') .hasMatch(url)) { source = s; break;