Merge pull request #1265 from ImranR98/dev

- Multi-host support + add '.net' host to APKPure source (#1250)
- HTML link parsing bugfix (#1259)
- APKMirror version extraction bugfix (#1264)

README.md

@@ -21,7 +21,7 @@ Currently supported App sources:
   - [SourceForge](https://sourceforge.net/)
   - [SourceHut](https://git.sr.ht/)
 - Other - General:
-  - [APKPure](https://apkpure.com/)
+  - [APKPure](https://apkpure.net/)
   - [Aptoide](https://aptoide.com/)
   - [Uptodown](https://uptodown.com/)
   - [APKMirror](https://apkmirror.com/) (Track-Only)

lib/app_sources/apkcombo.dart

@@ -5,17 +5,18 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class APKCombo extends AppSource {
   APKCombo() {
-    host = 'apkcombo.com';
+    hosts = ['apkcombo.com'];
   }
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/+[^/]+/+[^/]+');
+    RegExp standardUrlRegEx =
+        RegExp('^https?://(www\\.)?${getSourceRegex(hosts)}/+[^/]+/+[^/]+');
     var match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override
@@ -32,7 +33,7 @@ class APKCombo extends AppSource {
       "User-Agent": "curl/8.0.1",
       "Accept": "*/*",
       "Connection": "keep-alive",
-      "Host": "$host"
+      "Host": hosts[0]
     };
   }
 

lib/app_sources/apkmirror.dart

@@ -9,7 +9,7 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class APKMirror extends AppSource {
   APKMirror() {
-    host = 'apkmirror.com';
+    hosts = ['apkmirror.com'];
     enforceTrackOnly = true;
 
     additionalSourceAppSpecificSettingFormItems = [
@@ -33,12 +33,12 @@ class APKMirror extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx =
-        RegExp('^https?://(www\\.)?$host/apk/[^/]+/[^/]+');
+        RegExp('^https?://(www\\.)?${getSourceRegex(hosts)}/apk/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override
@@ -84,7 +84,7 @@ class APKMirror extends AppSource {
           dateString != null ? HttpDate.parse('$dateString GMT') : null;
       String? version = titleString
           ?.substring(RegExp('[0-9]').firstMatch(titleString)?.start ?? 0,
-              RegExp(' by ').firstMatch(titleString)?.start ?? 0)
+              RegExp(' by ').allMatches(titleString).last.start)
           .trim();
       if (version == null || version.isEmpty) {
         version = titleString;

lib/app_sources/apkpure.dart

@@ -20,7 +20,7 @@ parseDateTimeMMMddCommayyyy(String? dateString) {
 
 class APKPure extends AppSource {
   APKPure() {
-    host = 'apkpure.com';
+    hosts = ['apkpure.net', 'apkpure.com'];
     allowSubDomains = true;
     naiveStandardVersionDetection = true;
   }
@@ -28,18 +28,18 @@ class APKPure extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegExB =
-        RegExp('^https?://m.$host/+[^/]+/+[^/]+(/+[^/]+)?');
+        RegExp('^https?://m.${getSourceRegex(hosts)}/+[^/]+/+[^/]+(/+[^/]+)?');
     RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
     if (match != null) {
-      url = 'https://$host${Uri.parse(url).path}';
+      url = 'https://${getSourceRegex(hosts)}${Uri.parse(url).path}';
     }
-    RegExp standardUrlRegExA =
+    RegExp standardUrlRegExA = RegExp(
-        RegExp('^https?://(www\\.)?$host/+[^/]+/+[^/]+(/+[^/]+)?');
+        '^https?://(www\\.)?${getSourceRegex(hosts)}/+[^/]+/+[^/]+(/+[^/]+)?');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override

lib/app_sources/aptoide.dart

@@ -6,7 +6,7 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class Aptoide extends AppSource {
   Aptoide() {
-    host = 'aptoide.com';
+    hosts = ['aptoide.com'];
     name = 'Aptoide';
     allowSubDomains = true;
     naiveStandardVersionDetection = true;
@@ -14,12 +14,13 @@ class Aptoide extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://([^\\.]+\\.){2,}$host');
+    RegExp standardUrlRegEx =
+        RegExp('^https?://([^\\.]+\\.){2,}${getSourceRegex(hosts)}');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override

lib/app_sources/codeberg.dart

@@ -5,7 +5,7 @@ import 'package:obtainium/providers/source_provider.dart';
 class Codeberg extends AppSource {
   GitHub gh = GitHub();
   Codeberg() {
-    host = 'codeberg.org';
+    hosts = ['codeberg.org'];
 
     additionalSourceAppSpecificSettingFormItems =
         gh.additionalSourceAppSpecificSettingFormItems;
@@ -16,12 +16,13 @@ class Codeberg extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/[^/]+/[^/]+');
+    RegExp standardUrlRegEx =
+        RegExp('^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override
@@ -35,7 +36,7 @@ class Codeberg extends AppSource {
   ) async {
     return await gh.getLatestAPKDetailsCommon2(standardUrl, additionalSettings,
         (bool useTagUrl) async {
-      return 'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/${useTagUrl ? 'tags' : 'releases'}?per_page=100';
+      return 'https://${hosts[0]}/api/v1/repos${standardUrl.substring('https://${hosts[0]}'.length)}/${useTagUrl ? 'tags' : 'releases'}?per_page=100';
     }, null);
   }
 
@@ -50,7 +51,7 @@ class Codeberg extends AppSource {
       {Map<String, dynamic> querySettings = const {}}) async {
     return gh.searchCommon(
         query,
-        'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100',
+        'https://${hosts[0]}/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100',
         'data',
         querySettings: querySettings);
   }

lib/app_sources/fdroid.dart

@@ -9,7 +9,7 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class FDroid extends AppSource {
   FDroid() {
-    host = 'f-droid.org';
+    hosts = ['f-droid.org'];
     name = tr('fdroid');
     naiveStandardVersionDetection = true;
     canSearch = true;
@@ -37,20 +37,20 @@ class FDroid extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegExB =
+    RegExp standardUrlRegExB = RegExp(
-        RegExp('^https?://(www\\.)?$host/+[^/]+/+packages/+[^/]+');
+        '^https?://(www\\.)?${getSourceRegex(hosts)}/+[^/]+/+packages/+[^/]+');
     RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
     if (match != null) {
       url =
-          'https://${Uri.parse(url.substring(0, match.end)).host}/packages/${Uri.parse(url).pathSegments.last}';
+          'https://${Uri.parse(match.group(0)!).host}/packages/${Uri.parse(url).pathSegments.last}';
     }
     RegExp standardUrlRegExA =
-        RegExp('^https?://(www\\.)?$host/+packages/+[^/]+');
+        RegExp('^https?://(www\\.)?${getSourceRegex(hosts)}/+packages/+[^/]+');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override
@@ -117,7 +117,7 @@ class FDroid extends AppSource {
   Future<Map<String, List<String>>> search(String query,
       {Map<String, dynamic> querySettings = const {}}) async {
     Response res = await sourceRequest(
-        'https://search.$host/?q=${Uri.encodeQueryComponent(query)}');
+        'https://search.${hosts[0]}/?q=${Uri.encodeQueryComponent(query)}');
     if (res.statusCode == 200) {
       Map<String, List<String>> urlsWithDescriptions = {};
       parse(res.body).querySelectorAll('.package-header').forEach((e) {

lib/app_sources/github.dart

@@ -14,7 +14,7 @@ import 'package:url_launcher/url_launcher_string.dart';
 
 class GitHub extends AppSource {
   GitHub() {
-    host = 'github.com';
+    hosts = ['github.com'];
     appIdInferIsOptional = true;
 
     sourceConfigSettingFormItems = [
@@ -149,12 +149,13 @@ class GitHub extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/[^/]+/[^/]+');
+    RegExp standardUrlRegEx =
+        RegExp('^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override
@@ -203,11 +204,11 @@ class GitHub extends AppSource {
   }
 
   Future<String> getAPIHost(Map<String, dynamic> additionalSettings) async =>
-      'https://api.$host';
+      'https://api.${hosts[0]}';
 
   Future<String> convertStandardUrlToAPIUrl(
           String standardUrl, Map<String, dynamic> additionalSettings) async =>
-      '${await getAPIHost(additionalSettings)}/repos${standardUrl.substring('https://$host'.length)}';
+      '${await getAPIHost(additionalSettings)}/repos${standardUrl.substring('https://${hosts[0]}'.length)}';
 
   @override
   String? changeLogPageFromStandardUrl(String standardUrl) =>

lib/app_sources/gitlab.dart

@@ -13,7 +13,7 @@ import 'package:url_launcher/url_launcher_string.dart';
 
 class GitLab extends AppSource {
   GitLab() {
-    host = 'gitlab.com';
+    hosts = ['gitlab.com'];
     canSearch = true;
 
     sourceConfigSettingFormItems = [
@@ -52,12 +52,13 @@ class GitLab extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/[^/]+/[^/]+');
+    RegExp standardUrlRegEx =
+        RegExp('^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   Future<String?> getPATIfAny(Map<String, dynamic> additionalSettings) async {
@@ -81,7 +82,7 @@ class GitLab extends AppSource {
   Future<Map<String, List<String>>> search(String query,
       {Map<String, dynamic> querySettings = const {}}) async {
     var url =
-        'https://$host/api/v4/projects?search=${Uri.encodeQueryComponent(query)}';
+        'https://${hosts[0]}/api/v4/projects?search=${Uri.encodeQueryComponent(query)}';
     var res = await sourceRequest(url);
     if (res.statusCode != 200) {
       throw getObtainiumHttpError(res);
@@ -89,7 +90,7 @@ class GitLab extends AppSource {
     var json = jsonDecode(res.body) as List<dynamic>;
     Map<String, List<String>> results = {};
     for (var element in json) {
-      results['https://$host/${element['path_with_namespace']}'] = [
+      results['https://${hosts[0]}/${element['path_with_namespace']}'] = [
         element['name_with_namespace'],
         element['description'] ?? tr('noDescription')
       ];
@@ -113,7 +114,7 @@ class GitLab extends AppSource {
     if (PAT != null) {
       var names = GitHub().getAppNames(standardUrl);
       Response res = await sourceRequest(
-          'https://$host/api/v4/projects/${names.author}%2F${names.name}/releases?private_token=$PAT');
+          'https://${hosts[0]}/api/v4/projects/${names.author}%2F${names.name}/releases?private_token=$PAT');
       if (res.statusCode != 200) {
         throw getObtainiumHttpError(res);
       }

lib/app_sources/html.dart

@@ -19,6 +19,8 @@ String ensureAbsoluteUrl(String ambiguousUrl, Uri referenceAbsoluteUrl) {
       .toList();
   String absoluteUrl;
   if (ambiguousUrl.startsWith('/') || currPathSegments.isEmpty) {
+    absoluteUrl = '${referenceAbsoluteUrl.origin}$ambiguousUrl';
+  } else if (currPathSegments.isEmpty) {
     absoluteUrl = '${referenceAbsoluteUrl.origin}/$ambiguousUrl';
   } else if (ambiguousUrl.split('/').where((e) => e.isNotEmpty).length == 1) {
     absoluteUrl =

lib/app_sources/huaweiappgallery.dart

@@ -6,23 +6,24 @@ import 'package:obtainium/providers/source_provider.dart';
 class HuaweiAppGallery extends AppSource {
   HuaweiAppGallery() {
     name = 'Huawei AppGallery';
-    host = 'appgallery.huawei.com';
+    hosts = ['appgallery.huawei.com'];
     overrideVersionDetectionFormDefault('releaseDateAsVersion',
         disableStandard: true);
   }
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/app/[^/]+');
+    RegExp standardUrlRegEx =
+        RegExp('^https?://(www\\.)?${getSourceRegex(hosts)}/app/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   getDlUrl(String standardUrl) =>
-      'https://${host!.replaceAll('appgallery.', 'appgallery.cloud.')}/appdl/${standardUrl.split('/').last}';
+      'https://${hosts[0].replaceAll('appgallery.', 'appgallery.cloud.')}/appdl/${standardUrl.split('/').last}';
 
   requestAppdlRedirect(String dlUrl) async {
     Response res = await sourceRequest(dlUrl, followRedirects: false);

lib/app_sources/izzyondroid.dart

@@ -6,7 +6,7 @@ class IzzyOnDroid extends AppSource {
   late FDroid fd;
 
   IzzyOnDroid() {
-    host = 'izzysoft.de';
+    hosts = ['izzysoft.de'];
     fd = FDroid();
     additionalSourceAppSpecificSettingFormItems =
         fd.additionalSourceAppSpecificSettingFormItems;
@@ -15,17 +15,18 @@ class IzzyOnDroid extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegExA = RegExp('^https?://android.$host/repo/apk/[^/]+');
+    RegExp standardUrlRegExA =
+        RegExp('^https?://android.${getSourceRegex(hosts)}/repo/apk/[^/]+');
     RegExpMatch? match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
-      RegExp standardUrlRegExB =
+      RegExp standardUrlRegExB = RegExp(
-          RegExp('^https?://apt.$host/fdroid/index/apk/[^/]+');
+          '^https?://apt.${getSourceRegex(hosts)}/fdroid/index/apk/[^/]+');
       match = standardUrlRegExB.firstMatch(url.toLowerCase());
     }
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override

lib/app_sources/jenkins.dart

@@ -16,7 +16,7 @@ class Jenkins extends AppSource {
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override

lib/app_sources/mullvad.dart

@@ -6,17 +6,18 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class Mullvad extends AppSource {
   Mullvad() {
-    host = 'mullvad.net';
+    hosts = ['mullvad.net'];
   }
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host');
+    RegExp standardUrlRegEx =
+        RegExp('^https?://(www\\.)?${getSourceRegex(hosts)}');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override

lib/app_sources/neutroncode.dart

@@ -5,18 +5,18 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class NeutronCode extends AppSource {
   NeutronCode() {
-    host = 'neutroncode.com';
+    hosts = ['neutroncode.com'];
   }
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx =
+    RegExp standardUrlRegEx = RegExp(
-        RegExp('^https?://(www\\.)?$host/downloads/file/[^/]+');
+        '^https?://(www\\.)?${getSourceRegex(hosts)}/downloads/file/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override
@@ -92,7 +92,7 @@ class NeutronCode extends AppSource {
       if (version == null) {
         throw NoVersionError();
       }
-      String? apkUrl = 'https://$host/download/$filename';
+      String? apkUrl = 'https://${hosts[0]}/download/$filename';
       var dateStringOriginal =
           http.querySelector('.pd-date-txt')?.nextElementSibling?.innerHtml;
       var dateString = dateStringOriginal != null

lib/app_sources/signal.dart

@@ -5,12 +5,12 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class Signal extends AppSource {
   Signal() {
-    host = 'signal.org';
+    hosts = ['signal.org'];
   }
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    return 'https://$host';
+    return 'https://${hosts[0]}';
   }
 
   @override
@@ -19,7 +19,7 @@ class Signal extends AppSource {
     Map<String, dynamic> additionalSettings,
   ) async {
     Response res =
-        await sourceRequest('https://updates.$host/android/latest.json');
+        await sourceRequest('https://updates.${hosts[0]}/android/latest.json');
     if (res.statusCode == 200) {
       var json = jsonDecode(res.body);
       String? apkUrl = json['url'];

lib/app_sources/sourceforge.dart

@@ -5,24 +5,25 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class SourceForge extends AppSource {
   SourceForge() {
-    host = 'sourceforge.net';
+    hosts = ['sourceforge.net'];
   }
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegExB = RegExp('^https?://(www\\.)?$host/p/[^/]+');
+    RegExp standardUrlRegExB =
+        RegExp('^https?://(www\\.)?${getSourceRegex(hosts)}/p/[^/]+');
     RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
     if (match != null) {
       url =
-          'https://${Uri.parse(url.substring(0, match.end)).host}/projects/${url.substring(Uri.parse(url.substring(0, match.end)).host.length + '/projects/'.length + 1)}';
+          'https://${Uri.parse(match.group(0)!).host}/projects/${url.substring(Uri.parse(match.group(0)!).host.length + '/projects/'.length + 1)}';
     }
     RegExp standardUrlRegExA =
-        RegExp('^https?://(www\\.)?$host/projects/[^/]+');
+        RegExp('^https?://(www\\.)?${getSourceRegex(hosts)}/projects/[^/]+');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override

lib/app_sources/sourcehut.dart

@@ -8,7 +8,7 @@ import 'package:easy_localization/easy_localization.dart';
 
 class SourceHut extends AppSource {
   SourceHut() {
-    host = 'git.sr.ht';
+    hosts = ['git.sr.ht'];
 
     additionalSourceAppSpecificSettingFormItems = [
       [
@@ -20,12 +20,13 @@ class SourceHut extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/[^/]+/[^/]+');
+    RegExp standardUrlRegEx =
+        RegExp('^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return url.substring(0, match.end);
+    return match.group(0)!;
   }
 
   @override

lib/app_sources/steammobile.dart

@@ -7,7 +7,7 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class SteamMobile extends AppSource {
   SteamMobile() {
-    host = 'store.steampowered.com';
+    hosts = ['store.steampowered.com'];
     name = tr('steam');
     additionalSourceAppSpecificSettingFormItems = [
       [
@@ -21,7 +21,7 @@ class SteamMobile extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    return 'https://$host';
+    return 'https://${hosts[0]}';
   }
 
   @override
@@ -29,7 +29,7 @@ class SteamMobile extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    Response res = await sourceRequest('https://$host/mobile');
+    Response res = await sourceRequest('https://${hosts[0]}/mobile');
     if (res.statusCode == 200) {
       var apkNamePrefix = additionalSettings['app'] as String?;
       if (apkNamePrefix == null) {

lib/app_sources/telegramapp.dart

@@ -6,13 +6,13 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class TelegramApp extends AppSource {
   TelegramApp() {
-    host = 'telegram.org';
+    hosts = ['telegram.org'];
     name = 'Telegram ${tr('app')}';
   }
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    return 'https://$host';
+    return 'https://${hosts[0]}';
   }
 
   @override

lib/app_sources/uptodown.dart

@@ -6,19 +6,20 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class Uptodown extends AppSource {
   Uptodown() {
-    host = 'uptodown.com';
+    hosts = ['uptodown.com'];
     allowSubDomains = true;
     naiveStandardVersionDetection = true;
   }
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://([^\\.]+\\.){2,}$host');
+    RegExp standardUrlRegEx =
+        RegExp('^https?://([^\\.]+\\.){2,}${getSourceRegex(hosts)}');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
-    return '${url.substring(0, match.end)}/android/download';
+    return '${match.group(0)!}/android/download';
   }
 
   @override
@@ -94,6 +95,6 @@ class Uptodown extends AppSource {
     if (finalUrlKey == null) {
       throw NoAPKError();
     }
-    return 'https://dw.$host/dwn/$finalUrlKey';
+    return 'https://dw.${hosts[0]}/dwn/$finalUrlKey';
   }
 }

lib/app_sources/vlc.dart

@@ -7,9 +7,9 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class VLC extends AppSource {
   VLC() {
-    host = 'videolan.org';
+    hosts = ['videolan.org'];
   }
-  get dwUrlBase => 'https://get.$host/vlc-android/';
+  get dwUrlBase => 'https://get.${hosts[0]}/vlc-android/';
 
   @override
   Future<Map<String, String>?> getRequestHeaders(
@@ -21,7 +21,7 @@ class VLC extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    return 'https://$host';
+    return 'https://${hosts[0]}';
   }
 
   Future<String?> getLatestVersion(String standardUrl) async {

lib/app_sources/whatsapp.dart

@@ -5,14 +5,14 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class WhatsApp extends AppSource {
   WhatsApp() {
-    host = 'whatsapp.com';
+    hosts = ['whatsapp.com'];
     overrideVersionDetectionFormDefault('noVersionDetection',
         disableStandard: true, disableRelDate: true);
   }
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    return 'https://$host';
+    return 'https://${hosts[0]}';
   }
 
   @override

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.15.7';
+const String currentVersion = '0.15.8';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/add_app.dart

@@ -59,7 +59,9 @@ class AddAppPageState extends State<AddAppPage> {
         if (updateUrlInput) {
           urlInputKey++;
         }
-        var prevHost = pickedSource?.host;
+        var prevHost = pickedSource?.hosts.isNotEmpty == true
+            ? pickedSource?.hosts[0]
+            : null;
         try {
           var naturalSource =
               valid ? sourceProvider.getSource(userInput) : null;
@@ -77,7 +79,7 @@ class AddAppPageState extends State<AddAppPage> {
                 overrideSource: pickedSourceOverride)
             : null;
         if (pickedSource.runtimeType != source.runtimeType ||
-            (prevHost != null && prevHost != source?.host)) {
+            (prevHost != null && prevHost != source?.hosts[0])) {
           pickedSource = source;
           additionalSettings = source != null
               ? getDefaultValuesFromFormItems(
@@ -508,16 +510,16 @@ class AddAppPageState extends State<AddAppPage> {
                 height: 16,
               ),
               ...sourceProvider.sources.map((e) => GestureDetector(
-                  onTap: e.host != null
+                  onTap: e.hosts.isNotEmpty
                       ? () {
-                          launchUrlString('https://${e.host}',
+                          launchUrlString('https://${e.hosts[0]}',
                               mode: LaunchMode.externalApplication);
                         }
                       : null,
                   child: Text(
                     '${e.name}${e.enforceTrackOnly ? ' ${tr('trackOnlyInBrackets')}' : ''}${e.canSearch ? ' ${tr('searchableInBrackets')}' : ''}',
                     style: TextStyle(
-                        decoration: e.host != null
+                        decoration: e.hosts.isNotEmpty
                             ? TextDecoration.underline
                             : TextDecoration.none,
                         fontStyle: FontStyle.italic),

lib/pages/import_export.dart

@@ -199,10 +199,11 @@ class _ImportExportPageState extends State<ImportExportPage> {
                   ...source.searchQuerySettingFormItems.map((e) => [e]),
                   [
                     GeneratedFormTextField('url',
-                        label: source.host != null
+                        label: source.hosts.isNotEmpty
                             ? tr('overrideSource')
                             : plural('url', 1).substring(2),
-                        defaultValue: source.host ?? '',
+                        defaultValue:
+                            source.hosts.isNotEmpty ? source.hosts[0] : '',
                         required: true)
                   ],
                 ],
@@ -212,7 +213,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
           setState(() {
             importInProgress = true;
           });
-          if (values['url'] != source.host) {
+          if (values['url'] != source.hosts[0]) {
             source = sourceProvider.getSource(values['url'],
                 overrideSource: source.runtimeType.toString());
           }

lib/providers/settings_provider.dart

@@ -14,7 +14,7 @@ import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:shared_storage/shared_storage.dart' as saf;
 
-String obtainiumTempId = 'imranr98_obtainium_${GitHub().host}';
+String obtainiumTempId = 'imranr98_obtainium_${GitHub().hosts[0]}';
 String obtainiumId = 'dev.imranr.obtainium';
 
 enum InstallMethodSettings { normal, shizuku, root }

lib/providers/source_provider.dart

@@ -366,8 +366,12 @@ List<MapEntry<String, String>> getApkUrlsFromUrls(List<String> urls) =>
       return MapEntry(apkSegs.isNotEmpty ? apkSegs.last : segments.last, e);
     }).toList();
 
+getSourceRegex(List<String> hosts) {
+  return '(${hosts.join('|').replaceAll('.', '\\.')})';
+}
+
 abstract class AppSource {
-  String? host;
+  List<String> hosts = [];
   bool hostChanged = false;
   late String name;
   bool enforceTrackOnly = false;
@@ -697,14 +701,14 @@ class SourceProvider {
         throw UnsupportedURLError();
       }
       var res = srcs.first;
-      res.host = Uri.parse(url).host;
+      res.hosts = [Uri.parse(url).host];
       res.hostChanged = true;
       return srcs.first;
     }
     AppSource? source;
-    for (var s in sources.where((element) => element.host != null)) {
+    for (var s in sources.where((element) => element.hosts.isNotEmpty)) {
       if (RegExp(
-              '://${s.allowSubDomains ? '([^\\.]+\\.)*' : '(www\\.)?'}${s.host}(/|\\z)?')
+              '://${s.allowSubDomains ? '([^\\.]+\\.)*' : '(www\\.)?'}(${getSourceRegex(s.hosts)})(/|\\z)?')
           .hasMatch(url)) {
         source = s;
         break;
@@ -712,7 +716,7 @@ class SourceProvider {
     }
     if (source == null) {
       for (var s in sources.where(
-          (element) => element.host == null && !element.neverAutoSelect)) {
+          (element) => element.hosts.isEmpty && !element.neverAutoSelect)) {
         try {
           s.sourceSpecificStandardizeURL(url);
           source = s;

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.15.7+243 # When changing this, update the tag in main() accordingly
+version: 0.15.8+244 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=3.0.0 <4.0.0'