Merge branch 'main' into flavors

lib/app_sources/apkcombo.dart

@@ -0,0 +1,118 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class APKCombo extends AppSource {
+  APKCombo() {
+    host = 'apkcombo.com';
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/+[^/]+/+[^/]+');
+    var match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
+    return Uri.parse(standardUrl).pathSegments.last;
+  }
+
+  @override
+  Future<Map<String, String>?> getRequestHeaders(
+      {Map<String, dynamic> additionalSettings = const <String, dynamic>{},
+      bool forAPKDownload = false}) async {
+    return {
+      "User-Agent": "curl/8.0.1",
+      "Accept": "*/*",
+      "Connection": "keep-alive",
+      "Host": "$host"
+    };
+  }
+
+  Future<List<MapEntry<String, String>>> getApkUrls(String standardUrl) async {
+    var res = await sourceRequest('$standardUrl/download/apk');
+    if (res.statusCode != 200) {
+      throw getObtainiumHttpError(res);
+    }
+    var html = parse(res.body);
+    return html
+        .querySelectorAll('#variants-tab > div > ul > li')
+        .map((e) {
+          String? arch = e
+              .querySelector('code')
+              ?.text
+              .trim()
+              .replaceAll(',', '')
+              .replaceAll(':', '-')
+              .replaceAll(' ', '-');
+          return e.querySelectorAll('a').map((e) {
+            String? url = e.attributes['href'];
+            if (url != null &&
+                !Uri.parse(url).path.toLowerCase().endsWith('.apk')) {
+              url = null;
+            }
+            String verCode =
+                e.querySelector('.info .header .vercode')?.text.trim() ?? '';
+            return MapEntry<String, String>(
+                arch != null ? '$arch-$verCode.apk' : '', url ?? '');
+          }).toList();
+        })
+        .reduce((value, element) => [...value, ...element])
+        .where((element) => element.value.isNotEmpty)
+        .toList();
+  }
+
+  @override
+  Future<String> apkUrlPrefetchModifier(
+      String apkUrl, String standardUrl) async {
+    var freshURLs = await getApkUrls(standardUrl);
+    var path2Match = Uri.parse(apkUrl).path;
+    for (var url in freshURLs) {
+      if (Uri.parse(url.value).path == path2Match) {
+        return url.value;
+      }
+    }
+    throw NoAPKError();
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    String appId = (await tryInferringAppId(standardUrl))!;
+    var preres = await sourceRequest(standardUrl);
+    if (preres.statusCode != 200) {
+      throw getObtainiumHttpError(preres);
+    }
+    var res = parse(preres.body);
+    String? version = res.querySelector('div.version')?.text.trim();
+    if (version == null) {
+      throw NoVersionError();
+    }
+    String appName = res.querySelector('div.app_name')?.text.trim() ?? appId;
+    String author = res.querySelector('div.author')?.text.trim() ?? appName;
+    List<String> infoArray = res
+        .querySelectorAll('div.information-table > .item > div.value')
+        .map((e) => e.text.trim())
+        .toList();
+    DateTime? releaseDate;
+    if (infoArray.length >= 2) {
+      try {
+        releaseDate = DateFormat('MMMM d, yyyy').parse(infoArray[1]);
+      } catch (e) {
+        // ignore
+      }
+    }
+    return APKDetails(
+        version, await getApkUrls(standardUrl), AppNames(author, appName),
+        releaseDate: releaseDate);
+  }
+}

lib/app_sources/apkmirror.dart

@@ -1,5 +1,9 @@
+import 'dart:io';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
@@ -7,10 +11,27 @@ class APKMirror extends AppSource {
   APKMirror() {
     host = 'apkmirror.com';
     enforceTrackOnly = true;
+
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ],
+      [
+        GeneratedFormTextField('filterReleaseTitlesByRegEx',
+            label: tr('filterReleaseTitlesByRegEx'),
+            required: false,
+            additionalValidators: [
+              (value) {
+                return regExValidator(value);
+              }
+            ])
+      ]
+    ];
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/apk/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
@@ -28,12 +49,38 @@ class APKMirror extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    Response res = await get(Uri.parse('$standardUrl/feed'));
+    bool fallbackToOlderReleases =
+        additionalSettings['fallbackToOlderReleases'] == true;
+    String? regexFilter =
+        (additionalSettings['filterReleaseTitlesByRegEx'] as String?)
+                    ?.isNotEmpty ==
+                true
+            ? additionalSettings['filterReleaseTitlesByRegEx']
+            : null;
+    Response res = await sourceRequest('$standardUrl/feed');
     if (res.statusCode == 200) {
-      String? titleString = parse(res.body)
-          .querySelector('item')
-          ?.querySelector('title')
-          ?.innerHtml;
+      var items = parse(res.body).querySelectorAll('item');
+      dynamic targetRelease;
+      for (int i = 0; i < items.length; i++) {
+        if (!fallbackToOlderReleases && i > 0) break;
+        String? nameToFilter = items[i].querySelector('title')?.innerHtml;
+        if (regexFilter != null &&
+            nameToFilter != null &&
+            !RegExp(regexFilter).hasMatch(nameToFilter.trim())) {
+          continue;
+        }
+        targetRelease = items[i];
+        break;
+      }
+      String? titleString = targetRelease?.querySelector('title')?.innerHtml;
+      String? dateString = targetRelease
+          ?.querySelector('pubDate')
+          ?.innerHtml
+          .split(' ')
+          .sublist(0, 5)
+          .join(' ');
+      DateTime? releaseDate =
+          dateString != null ? HttpDate.parse('$dateString GMT') : null;
       String? version = titleString
           ?.substring(RegExp('[0-9]').firstMatch(titleString)?.start ?? 0,
               RegExp(' by ').firstMatch(titleString)?.start ?? 0)
@@ -44,7 +91,8 @@ class APKMirror extends AppSource {
       if (version == null || version.isEmpty) {
         throw NoVersionError();
       }
-      return APKDetails(version, [], getAppNames(standardUrl));
+      return APKDetails(version, [], getAppNames(standardUrl),
+          releaseDate: releaseDate);
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/apkpure.dart

@@ -0,0 +1,93 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+parseDateTimeMMMddCommayyyy(String? dateString) {
+  DateTime? releaseDate;
+  try {
+    releaseDate = dateString != null
+        ? DateFormat('MMM dd, yyyy').parse(dateString)
+        : null;
+    releaseDate = dateString != null && releaseDate == null
+        ? DateFormat('MMMM dd, yyyy').parse(dateString)
+        : releaseDate;
+  } catch (err) {
+    // ignore
+  }
+  return releaseDate;
+}
+
+class APKPure extends AppSource {
+  APKPure() {
+    host = 'apkpure.com';
+    allowSubDomains = true;
+    naiveStandardVersionDetection = true;
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    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/+[^/]+/+[^/]+(/+[^/]+)?');
+    match = standardUrlRegExA.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
+    return Uri.parse(standardUrl).pathSegments.last;
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    String appId = (await tryInferringAppId(standardUrl))!;
+    String host = Uri.parse(standardUrl).host;
+    var res = await sourceRequest('$standardUrl/download');
+    var resChangelog = await sourceRequest(standardUrl);
+    if (res.statusCode == 200 && resChangelog.statusCode == 200) {
+      var html = parse(res.body);
+      var htmlChangelog = parse(resChangelog.body);
+      String? version = html.querySelector('span.info-sdk span')?.text.trim();
+      if (version == null) {
+        throw NoVersionError();
+      }
+      String? dateString =
+          html.querySelector('span.info-other span.date')?.text.trim();
+      DateTime? releaseDate = parseDateTimeMMMddCommayyyy(dateString);
+      String type = html.querySelector('a.info-tag')?.text.trim() ?? 'APK';
+      List<MapEntry<String, String>> apkUrls = [
+        MapEntry('$appId.apk', 'https://d.$host/b/$type/$appId?version=latest')
+      ];
+      String author = html
+              .querySelector('span.info-sdk')
+              ?.text
+              .trim()
+              .substring(version.length + 4) ??
+          Uri.parse(standardUrl).pathSegments.reversed.last;
+      String appName =
+          html.querySelector('h1.info-title')?.text.trim() ?? appId;
+      String? changeLog = htmlChangelog
+          .querySelector("div.whats-new-info p:not(.date)")
+          ?.innerHtml
+          .trim()
+          .replaceAll("<br>", "  \n");
+      return APKDetails(version, apkUrls, AppNames(author, appName),
+          releaseDate: releaseDate, changeLog: changeLog);
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/app_sources/aptoide.dart

@@ -0,0 +1,77 @@
+import 'dart:convert';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class Aptoide extends AppSource {
+  Aptoide() {
+    host = 'aptoide.com';
+    name = tr('Aptoide');
+    allowSubDomains = true;
+    naiveStandardVersionDetection = true;
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://([^\\.]+\\.){2,}$host');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
+    return (await getAppDetailsJSON(standardUrl))['package'];
+  }
+
+  Future<Map<String, dynamic>> getAppDetailsJSON(String standardUrl) async {
+    var res = await sourceRequest(standardUrl);
+    if (res.statusCode != 200) {
+      throw getObtainiumHttpError(res);
+    }
+    var idMatch = RegExp('"app":{"id":[0-9]+').firstMatch(res.body);
+    String? id;
+    if (idMatch != null) {
+      id = res.body.substring(idMatch.start + 12, idMatch.end);
+    } else {
+      throw NoReleasesError();
+    }
+    var res2 =
+        await sourceRequest('https://ws2.aptoide.com/api/7/getApp/app_id/$id');
+    if (res2.statusCode != 200) {
+      throw getObtainiumHttpError(res);
+    }
+    return jsonDecode(res2.body)?['nodes']?['meta']?['data'];
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    var appDetails = await getAppDetailsJSON(standardUrl);
+    String appName = appDetails['name'] ?? tr('app');
+    String author = appDetails['developer']?['name'] ?? name;
+    String? dateStr = appDetails['updated'];
+    String? version = appDetails['file']?['vername'];
+    String? apkUrl = appDetails['file']?['path'];
+    if (version == null) {
+      throw NoVersionError();
+    }
+    if (apkUrl == null) {
+      throw NoAPKError();
+    }
+    DateTime? relDate;
+    if (dateStr != null) {
+      relDate = DateTime.parse(dateStr);
+    }
+
+    return APKDetails(
+        version, getApkUrlsFromUrls([apkUrl]), AppNames(author, appName),
+        releaseDate: relDate);
+  }
+}

lib/app_sources/codeberg.dart

@@ -1,50 +1,21 @@
-import 'dart:convert';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:http/http.dart';
-import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
 class Codeberg extends AppSource {
+  GitHub gh = GitHub();
   Codeberg() {
     host = 'codeberg.org';
 
-    additionalSourceSpecificSettingFormItems = [];
-
-    additionalSourceAppSpecificSettingFormItems = [
-      [
-        GeneratedFormSwitch('includePrereleases',
-            label: tr('includePrereleases'), defaultValue: false)
-      ],
-      [
-        GeneratedFormSwitch('fallbackToOlderReleases',
-            label: tr('fallbackToOlderReleases'), defaultValue: true)
-      ],
-      [
-        GeneratedFormTextField('filterReleaseTitlesByRegEx',
-            label: tr('filterReleaseTitlesByRegEx'),
-            required: false,
-            additionalValidators: [
-              (value) {
-                if (value == null || value.isEmpty) {
-                  return null;
-                }
-                try {
-                  RegExp(value);
-                } catch (e) {
-                  return tr('invalidRegEx');
-                }
-                return null;
-              }
-            ])
-      ]
-    ];
+    additionalSourceAppSpecificSettingFormItems =
+        gh.additionalSourceAppSpecificSettingFormItems;
 
     canSearch = true;
+    searchQuerySettingFormItems = gh.searchQuerySettingFormItems;
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
@@ -62,72 +33,10 @@ class Codeberg extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    bool includePrereleases = additionalSettings['includePrereleases'];
-    bool fallbackToOlderReleases =
-        additionalSettings['fallbackToOlderReleases'];
-    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'));
-    if (res.statusCode == 200) {
-      var releases = jsonDecode(res.body) as List<dynamic>;
-
-      List<String> getReleaseAPKUrls(dynamic release) =>
-          (release['assets'] as List<dynamic>?)
-              ?.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'))
-              .map((e) => e.value)
-              .toList() ??
-          [];
-
-      dynamic targetRelease;
-
-      for (int i = 0; i < releases.length; i++) {
-        if (!fallbackToOlderReleases && i > 0) break;
-        if (!includePrereleases && releases[i]['prerelease'] == true) {
-          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'];
-      if (version == null) {
-        throw NoVersionError();
-      }
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
-          getAppNames(standardUrl));
-    } else {
-      throw getObtainiumHttpError(res);
-    }
+    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';
+    }, null);
   }
 
   AppNames getAppNames(String standardUrl) {
@@ -137,21 +46,12 @@ class Codeberg extends AppSource {
   }
 
   @override
-  Future<Map<String, String>> 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<String, String> urlsWithDescriptions = {};
-      for (var e in (jsonDecode(res.body)['data'] as List<dynamic>)) {
-        urlsWithDescriptions.addAll({
-          e['html_url'] as String: e['description'] != null
-              ? e['description'] as String
-              : tr('noDescription')
-        });
-      }
-      return urlsWithDescriptions;
-    } else {
-      throw getObtainiumHttpError(res);
-    }
+  Future<Map<String, List<String>>> search(String query,
+      {Map<String, dynamic> querySettings = const {}}) async {
+    return gh.searchCommon(
+        query,
+        'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100',
+        'data',
+        querySettings: querySettings);
   }
 }

lib/app_sources/fdroid.dart

@@ -1,7 +1,9 @@
 import 'dart:convert';
 
 import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
@@ -9,15 +11,38 @@ class FDroid extends AppSource {
   FDroid() {
     host = 'f-droid.org';
     name = tr('fdroid');
+    naiveStandardVersionDetection = true;
+    canSearch = true;
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormTextField('filterVersionsByRegEx',
+            label: tr('filterVersionsByRegEx'),
+            required: false,
+            additionalValidators: [
+              (value) {
+                return regExValidator(value);
+              }
+            ])
+      ],
+      [
+        GeneratedFormSwitch('trySelectingSuggestedVersionCode',
+            label: tr('trySelectingSuggestedVersionCode'))
+      ],
+      [
+        GeneratedFormSwitch('autoSelectHighestVersionCode',
+            label: tr('autoSelectHighestVersionCode'))
+      ],
+    ];
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegExB =
         RegExp('^https?://$host/+[^/]+/+packages/+[^/]+');
     RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
     if (match != null) {
-      url = 'https://$host/packages/${Uri.parse(url).pathSegments.last}';
+      url =
+          'https://${Uri.parse(url.substring(0, match.end)).host}/packages/${Uri.parse(url).pathSegments.last}';
     }
     RegExp standardUrlRegExA = RegExp('^https?://$host/+packages/+[^/]+');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
@@ -28,45 +53,137 @@ class FDroid extends AppSource {
   }
 
   @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
-  @override
-  String? tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) {
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
     return Uri.parse(standardUrl).pathSegments.last;
   }
 
-  APKDetails getAPKUrlsFromFDroidPackagesAPIResponse(
-      Response res, String apkUrlPrefix, String standardUrl) {
-    if (res.statusCode == 200) {
-      List<dynamic> releases = jsonDecode(res.body)['packages'] ?? [];
-      if (releases.isEmpty) {
-        throw NoReleasesError();
-      }
-      String? latestVersion = releases[0]['versionName'];
-      if (latestVersion == null) {
-        throw NoVersionError();
-      }
-      List<String> apkUrls = releases
-          .where((element) => element['versionName'] == latestVersion)
-          .map((e) => '${apkUrlPrefix}_${e['versionCode']}.apk')
-          .toList();
-      return APKDetails(latestVersion, apkUrls,
-          AppNames(name, Uri.parse(standardUrl).pathSegments.last));
-    } else {
-      throw getObtainiumHttpError(res);
-    }
-  }
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    String? appId = tryInferringAppId(standardUrl);
+    String? appId = await tryInferringAppId(standardUrl);
+    String host = Uri.parse(standardUrl).host;
     return getAPKUrlsFromFDroidPackagesAPIResponse(
-        await get(Uri.parse('https://f-droid.org/api/v1/packages/$appId')),
-        'https://f-droid.org/repo/$appId',
-        standardUrl);
+        await sourceRequest('https://$host/api/v1/packages/$appId'),
+        'https://$host/repo/$appId',
+        standardUrl,
+        name,
+        autoSelectHighestVersionCode:
+            additionalSettings['autoSelectHighestVersionCode'] == true,
+        trySelectingSuggestedVersionCode:
+            additionalSettings['trySelectingSuggestedVersionCode'] == true,
+        filterVersionsByRegEx:
+            (additionalSettings['filterVersionsByRegEx'] as String?)
+                        ?.isNotEmpty ==
+                    true
+                ? additionalSettings['filterVersionsByRegEx']
+                : null);
+  }
+
+  @override
+  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)}');
+    if (res.statusCode == 200) {
+      Map<String, List<String>> urlsWithDescriptions = {};
+      parse(res.body).querySelectorAll('.package-header').forEach((e) {
+        String? url = e.attributes['href'];
+        if (url != null) {
+          try {
+            standardizeUrl(url);
+          } catch (e) {
+            url = null;
+          }
+        }
+        if (url != null) {
+          urlsWithDescriptions[url] = [
+            e.querySelector('.package-name')?.text.trim() ?? '',
+            e.querySelector('.package-summary')?.text.trim() ??
+                tr('noDescription')
+          ];
+        }
+      });
+      return urlsWithDescriptions;
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}
+
+APKDetails getAPKUrlsFromFDroidPackagesAPIResponse(
+    Response res, String apkUrlPrefix, String standardUrl, String sourceName,
+    {bool autoSelectHighestVersionCode = false,
+    bool trySelectingSuggestedVersionCode = false,
+    String? filterVersionsByRegEx}) {
+  if (res.statusCode == 200) {
+    var response = jsonDecode(res.body);
+    List<dynamic> releases = response['packages'] ?? [];
+    if (releases.isEmpty) {
+      throw NoReleasesError();
+    }
+    String? version;
+    Iterable<dynamic> releaseChoices = [];
+    // Grab the versionCode suggested if the user chose to do that
+    // Only do so at this stage if the user has no release filter
+    if (trySelectingSuggestedVersionCode &&
+        response['suggestedVersionCode'] != null &&
+        filterVersionsByRegEx == null) {
+      var suggestedReleases = releases.where((element) =>
+          element['versionCode'] == response['suggestedVersionCode']);
+      if (suggestedReleases.isNotEmpty) {
+        releaseChoices = suggestedReleases;
+        version = suggestedReleases.first['versionName'];
+      }
+    }
+    // Apply the release filter if any
+    if (filterVersionsByRegEx != null) {
+      version = null;
+      releaseChoices = [];
+      for (var i = 0; i < releases.length; i++) {
+        if (RegExp(filterVersionsByRegEx)
+            .hasMatch(releases[i]['versionName'])) {
+          version = releases[i]['versionName'];
+        }
+      }
+      if (version == null) {
+        throw NoVersionError();
+      }
+    }
+    // Default to the highest version
+    version ??= releases[0]['versionName'];
+    if (version == null) {
+      throw NoVersionError();
+    }
+    // If a suggested release was not already picked, pick all those with the selected version
+    if (releaseChoices.isEmpty) {
+      releaseChoices =
+          releases.where((element) => element['versionName'] == version);
+    }
+    // For the remaining releases, use the toggles to auto-select one if possible
+    if (releaseChoices.length > 1) {
+      if (autoSelectHighestVersionCode) {
+        releaseChoices = [releaseChoices.first];
+      } else if (trySelectingSuggestedVersionCode &&
+          response['suggestedVersionCode'] != null) {
+        var suggestedReleases = releaseChoices.where((element) =>
+            element['versionCode'] == response['suggestedVersionCode']);
+        if (suggestedReleases.isNotEmpty) {
+          releaseChoices = suggestedReleases;
+        }
+      }
+    }
+    if (releaseChoices.isEmpty) {
+      throw NoReleasesError();
+    }
+    List<String> apkUrls = releaseChoices
+        .map((e) => '${apkUrlPrefix}_${e['versionCode']}.apk')
+        .toList();
+    return APKDetails(version, getApkUrlsFromUrls(apkUrls.toSet().toList()),
+        AppNames(sourceName, Uri.parse(standardUrl).pathSegments.last));
+  } else {
+    throw getObtainiumHttpError(res);
   }
 }

lib/app_sources/fdroidrepo.dart

@@ -1,6 +1,5 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:html/parser.dart';
-import 'package:http/http.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -8,6 +7,9 @@ import 'package:obtainium/providers/source_provider.dart';
 class FDroidRepo extends AppSource {
   FDroidRepo() {
     name = tr('fdroidThirdPartyRepo');
+    canSearch = true;
+    excludeFromMassSearch = true;
+    neverAutoSelect = true;
 
     additionalSourceAppSpecificSettingFormItems = [
       [
@@ -15,19 +17,80 @@ class FDroidRepo extends AppSource {
             label: tr('appIdOrName'),
             hint: tr('reposHaveMultipleApps'),
             required: true)
+      ],
+      [
+        GeneratedFormSwitch('pickHighestVersionCode',
+            label: tr('pickHighestVersionCode'), defaultValue: false)
       ]
     ];
   }
 
-  @override
-  String standardizeURL(String url) {
-    RegExp standardUrlRegExp =
-        RegExp('^https?://.+/fdroid/([^/]+(/|\\?)|[^/]+\$)');
-    RegExpMatch? match = standardUrlRegExp.firstMatch(url.toLowerCase());
-    if (match == null) {
-      throw InvalidURLError(name);
+  String removeQueryParamsFromUrl(String url, {List<String> keep = const []}) {
+    var uri = Uri.parse(url);
+    Map<String, dynamic> resultParams = {};
+    uri.queryParameters.forEach((key, value) {
+      if (keep.contains(key)) {
+        resultParams[key] = value;
+      }
+    });
+    url = uri.replace(queryParameters: resultParams).toString();
+    if (url.endsWith('?')) {
+      url = url.substring(0, url.length - 1);
     }
-    return url.substring(0, match.end);
+    return url;
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    var standardUri = Uri.parse(url);
+    var pathSegments = standardUri.pathSegments;
+    if (pathSegments.last == 'index.xml') {
+      pathSegments.removeLast();
+      standardUri = standardUri.replace(path: pathSegments.join('/'));
+    }
+    return removeQueryParamsFromUrl(standardUri.toString(), keep: ['appId']);
+  }
+
+  @override
+  Future<Map<String, List<String>>> search(String query,
+      {Map<String, dynamic> querySettings = const {}}) async {
+    query = removeQueryParamsFromUrl(standardizeUrl(query));
+    var res = await sourceRequest('$query/index.xml');
+    if (res.statusCode == 200) {
+      var body = parse(res.body);
+      Map<String, List<String>> results = {};
+      body.querySelectorAll('application').toList().forEach((app) {
+        String appId = app.attributes['id']!;
+        results['$query?appId=$appId'] = [
+          app.querySelector('name')?.innerHtml ?? appId,
+          app.querySelector('desc')?.innerHtml ?? ''
+        ];
+      });
+      return results;
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+
+  @override
+  App endOfGetAppChanges(App app) {
+    var uri = Uri.parse(app.url);
+    String? appId;
+    if (!isTempId(app)) {
+      appId = app.id;
+    } else if (uri.queryParameters['appId'] != null) {
+      appId = uri.queryParameters['appId'];
+    }
+    if (appId != null) {
+      app.url = uri
+          .replace(
+              queryParameters: Map.fromEntries(
+                  [...uri.queryParameters.entries, MapEntry('appId', appId)]))
+          .toString();
+      app.additionalSettings['appIdOrName'] = appId;
+      app.id = appId;
+    }
+    return app;
   }
 
   @override
@@ -36,10 +99,17 @@ class FDroidRepo extends AppSource {
     Map<String, dynamic> additionalSettings,
   ) async {
     String? appIdOrName = additionalSettings['appIdOrName'];
+    var standardUri = Uri.parse(standardUrl);
+    if (standardUri.queryParameters['appId'] != null) {
+      appIdOrName = standardUri.queryParameters['appId'];
+    }
+    standardUrl = removeQueryParamsFromUrl(standardUrl);
+    bool pickHighestVersionCode = additionalSettings['pickHighestVersionCode'];
     if (appIdOrName == null) {
       throw NoReleasesError();
     }
-    var res = await get(Uri.parse('$standardUrl/index.xml'));
+    var res = await sourceRequest(
+        '$standardUrl${standardUrl.endsWith('/index.xml') ? '' : '/index.xml'}');
     if (res.statusCode == 200) {
       var body = parse(res.body);
       var foundApps = body.querySelectorAll('application').where((element) {
@@ -48,7 +118,7 @@ class FDroidRepo extends AppSource {
       if (foundApps.isEmpty) {
         foundApps = body.querySelectorAll('application').where((element) {
           return element.querySelector('name')?.innerHtml.toLowerCase() ==
-              appIdOrName.toLowerCase();
+              appIdOrName!.toLowerCase();
         }).toList();
       }
       if (foundApps.isEmpty) {
@@ -57,7 +127,7 @@ class FDroidRepo extends AppSource {
                   .querySelector('name')
                   ?.innerHtml
                   .toLowerCase()
-                  .contains(appIdOrName.toLowerCase()) ??
+                  .contains(appIdOrName!.toLowerCase()) ??
               false;
         }).toList();
       }
@@ -65,20 +135,34 @@ class FDroidRepo extends AppSource {
         throw ObtainiumError(tr('appWithIdOrNameNotFound'));
       }
       var authorName = body.querySelector('repo')?.attributes['name'] ?? name;
-      var appName =
-          foundApps[0].querySelector('name')?.innerHtml ?? appIdOrName;
+      String appId = foundApps[0].attributes['id']!;
+      foundApps[0].querySelector('name')?.innerHtml ?? appId;
+      var appName = foundApps[0].querySelector('name')?.innerHtml ?? appId;
       var releases = foundApps[0].querySelectorAll('package');
       String? latestVersion = releases[0].querySelector('version')?.innerHtml;
+      String? added = releases[0].querySelector('added')?.innerHtml;
+      DateTime? releaseDate = added != null ? DateTime.parse(added) : null;
       if (latestVersion == null) {
         throw NoVersionError();
       }
-      List<String> apkUrls = releases
+      var latestVersionReleases = releases
           .where((element) =>
               element.querySelector('version')?.innerHtml == latestVersion &&
               element.querySelector('apkname') != null)
+          .toList();
+      if (latestVersionReleases.length > 1 && pickHighestVersionCode) {
+        latestVersionReleases.sort((e1, e2) {
+          return int.parse(e2.querySelector('versioncode')!.innerHtml)
+              .compareTo(int.parse(e1.querySelector('versioncode')!.innerHtml));
+        });
+        latestVersionReleases = [latestVersionReleases[0]];
+      }
+      List<String> apkUrls = latestVersionReleases
           .map((e) => '$standardUrl/${e.querySelector('apkname')!.innerHtml}')
           .toList();
-      return APKDetails(latestVersion, apkUrls, AppNames(authorName, appName));
+      return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),
+          AppNames(authorName, appName),
+          releaseDate: releaseDate);
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/github.dart

@@ -1,9 +1,13 @@
 import 'dart:convert';
+import 'dart:io';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/apps_provider.dart';
+import 'package:obtainium/providers/logs_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:url_launcher/url_launcher_string.dart';
@@ -11,30 +15,16 @@ import 'package:url_launcher/url_launcher_string.dart';
 class GitHub extends AppSource {
   GitHub() {
     host = 'github.com';
+    appIdInferIsOptional = true;
 
-    additionalSourceSpecificSettingFormItems = [
+    sourceConfigSettingFormItems = [
       GeneratedFormTextField('github-creds',
           label: tr('githubPATLabel'),
           password: true,
           required: false,
-          additionalValidators: [
-            (value) {
-              if (value != null && value.trim().isNotEmpty) {
-                if (value
-                        .split(':')
-                        .where((element) => element.trim().isNotEmpty)
-                        .length !=
-                    2) {
-                  return tr('githubPATHint');
-                }
-              }
-              return null;
-            }
-          ],
-          hint: tr('githubPATFormat'),
           belowWidgets: [
             const SizedBox(
-              height: 8,
+              height: 4,
             ),
             GestureDetector(
                 onTap: () {
@@ -43,10 +33,13 @@ class GitHub extends AppSource {
                       mode: LaunchMode.externalApplication);
                 },
                 child: Text(
-                  tr('githubPATLinkText'),
+                  tr('about'),
                   style: const TextStyle(
                       decoration: TextDecoration.underline, fontSize: 12),
-                ))
+                )),
+            const SizedBox(
+              height: 4,
+            ),
           ])
     ];
 
@@ -65,25 +58,96 @@ class GitHub extends AppSource {
             required: false,
             additionalValidators: [
               (value) {
-                if (value == null || value.isEmpty) {
-                  return null;
-                }
-                try {
-                  RegExp(value);
-                } catch (e) {
-                  return tr('invalidRegEx');
-                }
-                return null;
+                return regExValidator(value);
               }
             ])
+      ],
+      [
+        GeneratedFormTextField('filterReleaseNotesByRegEx',
+            label: tr('filterReleaseNotesByRegEx'),
+            required: false,
+            additionalValidators: [
+              (value) {
+                return regExValidator(value);
+              }
+            ])
+      ],
+      [GeneratedFormSwitch('verifyLatestTag', label: tr('verifyLatestTag'))],
+      [
+        GeneratedFormSwitch('dontSortReleasesList',
+            label: tr('dontSortReleasesList'))
       ]
     ];
 
     canSearch = true;
+    searchQuerySettingFormItems = [
+      GeneratedFormTextField('minStarCount',
+          label: tr('minStarCount'),
+          defaultValue: '0',
+          additionalValidators: [
+            (value) {
+              try {
+                int.parse(value ?? '0');
+              } catch (e) {
+                return tr('invalidInput');
+              }
+              return null;
+            }
+          ])
+    ];
   }
 
   @override
-  String standardizeURL(String url) {
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
+    const possibleBuildGradleLocations = [
+      '/app/build.gradle',
+      'android/app/build.gradle',
+      'src/app/build.gradle'
+    ];
+    for (var path in possibleBuildGradleLocations) {
+      try {
+        var res = await sourceRequest(
+            '${await convertStandardUrlToAPIUrl(standardUrl, additionalSettings)}/contents/$path');
+        if (res.statusCode == 200) {
+          try {
+            var body = jsonDecode(res.body);
+            var trimmedLines = utf8
+                .decode(base64
+                    .decode(body['content'].toString().split('\n').join('')))
+                .split('\n')
+                .map((e) => e.trim());
+            var appId = trimmedLines
+                .where((l) =>
+                    l.startsWith('applicationId "') ||
+                    l.startsWith('applicationId \''))
+                .first;
+            appId = appId
+                .split(appId.startsWith('applicationId "') ? '"' : '\'')[1];
+            if (appId.startsWith('\${') && appId.endsWith('}')) {
+              appId = trimmedLines
+                  .where((l) => l.startsWith(
+                      'def ${appId.substring(2, appId.length - 1)}'))
+                  .first;
+              appId = appId.split(appId.contains('"') ? '"' : '\'')[1];
+            }
+            if (appId.isNotEmpty) {
+              return appId;
+            }
+          } catch (err) {
+            LogsProvider().add(
+                'Error parsing build.gradle from ${res.request!.url.toString()}: ${err.toString()}');
+          }
+        }
+      } catch (err) {
+        // Ignore - ID will be extracted from the APK
+      }
+    }
+    return null;
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
@@ -92,53 +156,170 @@ class GitHub extends AppSource {
     return url.substring(0, match.end);
   }
 
-  Future<String> getCredentialPrefixIfAny() async {
+  @override
+  Future<Map<String, String>?> getRequestHeaders(
+      {Map<String, dynamic> additionalSettings = const <String, dynamic>{},
+      bool forAPKDownload = false}) async {
+    var token = await getTokenIfAny(additionalSettings);
+    var headers = <String, String>{};
+    if (token != null) {
+      headers[HttpHeaders.authorizationHeader] = 'Token $token';
+    }
+    if (forAPKDownload == true) {
+      headers[HttpHeaders.acceptHeader] = 'application/octet-stream';
+    }
+    if (headers.isNotEmpty) {
+      return headers;
+    } else {
+      return null;
+    }
+  }
+
+  Future<String?> getTokenIfAny(Map<String, dynamic> additionalSettings) async {
     SettingsProvider settingsProvider = SettingsProvider();
     await settingsProvider.initializeSettings();
-    String? creds = settingsProvider
-        .getSettingString(additionalSourceSpecificSettingFormItems[0].key);
-    return creds != null && creds.isNotEmpty ? '$creds@' : '';
+    var sourceConfig =
+        await getSourceConfigValues(additionalSettings, settingsProvider);
+    String? creds = sourceConfig['github-creds'];
+    if (creds != null) {
+      var userNameEndIndex = creds.indexOf(':');
+      if (userNameEndIndex > 0) {
+        creds = creds.substring(
+            userNameEndIndex + 1); // For old username-included token inputs
+      }
+      return creds;
+    } else {
+      return null;
+    }
   }
 
+  @override
+  Future<String?> getSourceNote() async {
+    if (!hostChanged && (await getTokenIfAny({})) == null) {
+      return '${tr('githubSourceNote')} ${hostChanged ? tr('addInfoBelow') : tr('addInfoInSettings')}';
+    }
+    return null;
+  }
+
+  Future<String> getAPIHost(Map<String, dynamic> additionalSettings) async =>
+      'https://api.$host';
+
+  Future<String> convertStandardUrlToAPIUrl(
+          String standardUrl, Map<String, dynamic> additionalSettings) async =>
+      '${await getAPIHost(additionalSettings)}/repos${standardUrl.substring('https://$host'.length)}';
+
   @override
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       '$standardUrl/releases';
 
-  @override
-  Future<APKDetails> getLatestAPKDetails(
-    String standardUrl,
-    Map<String, dynamic> additionalSettings,
-  ) async {
-    bool includePrereleases = additionalSettings['includePrereleases'];
+  Future<APKDetails> getLatestAPKDetailsCommon(String requestUrl,
+      String standardUrl, Map<String, dynamic> additionalSettings,
+      {Function(Response)? onHttpErrorCode}) async {
+    bool includePrereleases = additionalSettings['includePrereleases'] == true;
     bool fallbackToOlderReleases =
-        additionalSettings['fallbackToOlderReleases'];
+        additionalSettings['fallbackToOlderReleases'] == true;
     String? regexFilter =
         (additionalSettings['filterReleaseTitlesByRegEx'] as String?)
                     ?.isNotEmpty ==
                 true
             ? additionalSettings['filterReleaseTitlesByRegEx']
             : null;
-    Response res = await get(Uri.parse(
-        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases'));
+    String? regexNotesFilter =
+        (additionalSettings['filterReleaseNotesByRegEx'] as String?)
+                    ?.isNotEmpty ==
+                true
+            ? additionalSettings['filterReleaseNotesByRegEx']
+            : null;
+    bool verifyLatestTag = additionalSettings['verifyLatestTag'] == true;
+    bool dontSortReleasesList =
+        additionalSettings['dontSortReleasesList'] == true;
+    String? latestTag;
+    if (verifyLatestTag) {
+      var temp = requestUrl.split('?');
+      Response res = await sourceRequest(
+          '${temp[0]}/latest${temp.length > 1 ? '?${temp.sublist(1).join('?')}' : ''}');
+      if (res.statusCode != 200) {
+        if (onHttpErrorCode != null) {
+          onHttpErrorCode(res);
+        }
+        throw getObtainiumHttpError(res);
+      }
+      var jsres = jsonDecode(res.body);
+      latestTag = jsres['tag_name'] ?? jsres['name'];
+    }
+    Response res = await sourceRequest(requestUrl);
     if (res.statusCode == 200) {
       var releases = jsonDecode(res.body) as List<dynamic>;
 
-      List<String> getReleaseAPKUrls(dynamic release) =>
+      List<MapEntry<String, String>> getReleaseAPKUrls(dynamic release) =>
           (release['assets'] as List<dynamic>?)
               ?.map((e) {
-                return e['browser_download_url'] != null
-                    ? e['browser_download_url'] as String
-                    : '';
+                return (e['name'] != null) &&
+                        ((e['url'] ?? e['browser_download_url']) != null)
+                    ? MapEntry(e['name'] as String,
+                        (e['url'] ?? 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;
+      if (dontSortReleasesList) {
+        releases = releases.reversed.toList();
+      } else {
+        releases.sort((a, b) {
+          // See #478 and #534
+          if (a == b) {
+            return 0;
+          } else if (a == null) {
+            return -1;
+          } else if (b == null) {
+            return 1;
+          } else {
+            var nameA = a['tag_name'] ?? a['name'];
+            var nameB = b['tag_name'] ?? b['name'];
+            var stdFormats = findStandardFormatsForVersion(nameA, true)
+                .intersection(findStandardFormatsForVersion(nameB, true));
+            if (stdFormats.isNotEmpty) {
+              var reg = RegExp(stdFormats.first);
+              var matchA = reg.firstMatch(nameA);
+              var matchB = reg.firstMatch(nameB);
+              return compareAlphaNumeric(
+                  (nameA as String).substring(matchA!.start, matchA.end),
+                  (nameB as String).substring(matchB!.start, matchB.end));
+            } else {
+              return (getReleaseDateFromRelease(a) ?? DateTime(1))
+                  .compareTo(getReleaseDateFromRelease(b) ?? DateTime(0));
+            }
+          }
+        });
+      }
+      if (latestTag != null &&
+          releases.isNotEmpty &&
+          latestTag !=
+              (releases[releases.length - 1]['tag_name'] ??
+                  releases[0]['name'])) {
+        var ind = releases.indexWhere(
+            (element) => latestTag == (element['tag_name'] ?? element['name']));
+        if (ind >= 0) {
+          releases.add(releases.removeAt(ind));
+        }
+      }
+      releases = releases.reversed.toList();
       dynamic targetRelease;
-
+      var prerrelsSkipped = 0;
       for (int i = 0; i < releases.length; i++) {
-        if (!fallbackToOlderReleases && i > 0) break;
+        if (!fallbackToOlderReleases && i > prerrelsSkipped) break;
         if (!includePrereleases && releases[i]['prerelease'] == true) {
+          prerrelsSkipped++;
+          continue;
+        }
+        if (releases[i]['draft'] == true) {
+          // Draft releases not supported
           continue;
         }
         var nameToFilter = releases[i]['name'] as String?;
@@ -150,6 +331,11 @@ class GitHub extends AppSource {
             !RegExp(regexFilter).hasMatch(nameToFilter.trim())) {
           continue;
         }
+        if (regexNotesFilter != null &&
+            !RegExp(regexNotesFilter)
+                .hasMatch(((releases[i]['body'] as String?) ?? '').trim())) {
+          continue;
+        }
         var apkUrls = getReleaseAPKUrls(releases[i]);
         if (apkUrls.isEmpty && additionalSettings['trackOnly'] != true) {
           continue;
@@ -161,44 +347,108 @@ class GitHub extends AppSource {
       if (targetRelease == null) {
         throw NoReleasesError();
       }
-      String? version = targetRelease['tag_name'];
+      String? version = targetRelease['tag_name'] ?? targetRelease['name'];
+      DateTime? releaseDate = getReleaseDateFromRelease(targetRelease);
       if (version == null) {
         throw NoVersionError();
       }
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
-          getAppNames(standardUrl));
+      var changeLog = targetRelease['body'].toString();
+      return APKDetails(
+          version,
+          targetRelease['apkUrls'] as List<MapEntry<String, String>>,
+          getAppNames(standardUrl),
+          releaseDate: releaseDate,
+          changeLog: changeLog.isEmpty ? null : changeLog);
     } else {
-      rateLimitErrorCheck(res);
+      if (onHttpErrorCode != null) {
+        onHttpErrorCode(res);
+      }
       throw getObtainiumHttpError(res);
     }
   }
 
+  getLatestAPKDetailsCommon2(
+      String standardUrl,
+      Map<String, dynamic> additionalSettings,
+      Future<String> Function(bool) reqUrlGenerator,
+      dynamic Function(Response)? onHttpErrorCode) async {
+    try {
+      return await getLatestAPKDetailsCommon(
+          await reqUrlGenerator(false), standardUrl, additionalSettings,
+          onHttpErrorCode: onHttpErrorCode);
+    } catch (err) {
+      if (err is NoReleasesError && additionalSettings['trackOnly'] == true) {
+        return await getLatestAPKDetailsCommon(
+            await reqUrlGenerator(true), standardUrl, additionalSettings,
+            onHttpErrorCode: onHttpErrorCode);
+      } else {
+        rethrow;
+      }
+    }
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    return await getLatestAPKDetailsCommon2(standardUrl, additionalSettings,
+        (bool useTagUrl) async {
+      return '${await convertStandardUrlToAPIUrl(standardUrl, additionalSettings)}/${useTagUrl ? 'tags' : 'releases'}?per_page=100';
+    }, (Response res) {
+      rateLimitErrorCheck(res);
+    });
+  }
+
   AppNames getAppNames(String standardUrl) {
     String temp = standardUrl.substring(standardUrl.indexOf('://') + 3);
     List<String> names = temp.substring(temp.indexOf('/') + 1).split('/');
     return AppNames(names[0], names[1]);
   }
 
-  @override
-  Future<Map<String, String>> 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<Map<String, List<String>>> searchCommon(
+      String query, String requestUrl, String rootProp,
+      {Function(Response)? onHttpErrorCode,
+      Map<String, dynamic> querySettings = const {}}) async {
+    Response res = await sourceRequest(requestUrl);
     if (res.statusCode == 200) {
-      Map<String, String> urlsWithDescriptions = {};
-      for (var e in (jsonDecode(res.body)['items'] as List<dynamic>)) {
-        urlsWithDescriptions.addAll({
-          e['html_url'] as String: e['description'] != null
-              ? e['description'] as String
-              : tr('noDescription')
-        });
+      int minStarCount = querySettings['minStarCount'] != null
+          ? int.parse(querySettings['minStarCount'])
+          : 0;
+      Map<String, List<String>> urlsWithDescriptions = {};
+      for (var e in (jsonDecode(res.body)[rootProp] as List<dynamic>)) {
+        if ((e['stargazers_count'] ?? e['stars_count'] ?? 0) >= minStarCount) {
+          urlsWithDescriptions.addAll({
+            e['html_url'] as String: [
+              e['full_name'] as String,
+              ((e['archived'] == true ? '[ARCHIVED] ' : '') +
+                  (e['description'] != null
+                      ? e['description'] as String
+                      : tr('noDescription')))
+            ]
+          });
+        }
       }
       return urlsWithDescriptions;
     } else {
-      rateLimitErrorCheck(res);
+      if (onHttpErrorCode != null) {
+        onHttpErrorCode(res);
+      }
       throw getObtainiumHttpError(res);
     }
   }
 
+  @override
+  Future<Map<String, List<String>>> search(String query,
+      {Map<String, dynamic> querySettings = const {}}) async {
+    return searchCommon(
+        query,
+        '${await getAPIHost({})}/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100',
+        'items', onHttpErrorCode: (Response res) {
+      rateLimitErrorCheck(res);
+    }, querySettings: querySettings);
+  }
+
   rateLimitErrorCheck(Response res) {
     if (res.headers['x-ratelimit-remaining'] == '0') {
       throw RateLimitError(

lib/app_sources/gitlab.dart

@@ -1,16 +1,57 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class GitLab extends AppSource {
   GitLab() {
     host = 'gitlab.com';
+    canSearch = true;
+
+    sourceConfigSettingFormItems = [
+      GeneratedFormTextField('gitlab-creds',
+          label: tr('gitlabPATLabel'),
+          password: true,
+          required: false,
+          belowWidgets: [
+            const SizedBox(
+              height: 4,
+            ),
+            GestureDetector(
+                onTap: () {
+                  launchUrlString(
+                      'https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html#create-a-personal-access-token',
+                      mode: LaunchMode.externalApplication);
+                },
+                child: Text(
+                  tr('about'),
+                  style: const TextStyle(
+                      decoration: TextDecoration.underline, fontSize: 12),
+                )),
+            const SizedBox(
+              height: 4,
+            )
+          ])
+    ];
+
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ]
+    ];
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
@@ -19,6 +60,47 @@ class GitLab extends AppSource {
     return url.substring(0, match.end);
   }
 
+  Future<String?> getPATIfAny(Map<String, dynamic> additionalSettings) async {
+    SettingsProvider settingsProvider = SettingsProvider();
+    await settingsProvider.initializeSettings();
+    var sourceConfig =
+        await getSourceConfigValues(additionalSettings, settingsProvider);
+    String? creds = sourceConfig['gitlab-creds'];
+    return creds != null && creds.isNotEmpty ? creds : null;
+  }
+
+  @override
+  Future<String?> getSourceNote() async {
+    if ((await getPATIfAny({})) == null) {
+      return '${tr('gitlabSourceNote')} ${hostChanged ? tr('addInfoBelow') : tr('addInfoInSettings')}';
+    }
+    return null;
+  }
+
+  @override
+  Future<Map<String, List<String>>> search(String query,
+      {Map<String, dynamic> querySettings = const {}}) async {
+    String? PAT = await getPATIfAny({});
+    if (PAT == null) {
+      throw CredsNeededError(name);
+    }
+    var url =
+        'https://$host/api/v4/search?private_token=$PAT&scope=projects&search=${Uri.encodeQueryComponent(query)}';
+    var res = await sourceRequest(url);
+    if (res.statusCode != 200) {
+      throw getObtainiumHttpError(res);
+    }
+    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']}'] = [
+        element['name_with_namespace'],
+        element['description'] ?? tr('noDescription')
+      ];
+    }
+    return results;
+  }
+
   @override
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       '$standardUrl/-/releases';
@@ -28,38 +110,99 @@ class GitLab extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    Response res = await get(Uri.parse('$standardUrl/-/tags?format=atom'));
-    if (res.statusCode == 200) {
+    bool fallbackToOlderReleases =
+        additionalSettings['fallbackToOlderReleases'] == true;
+    String? PAT = await getPATIfAny(hostChanged ? additionalSettings : {});
+    Iterable<APKDetails> apkDetailsList = [];
+    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');
+      if (res.statusCode != 200) {
+        throw getObtainiumHttpError(res);
+      }
+      var json = jsonDecode(res.body) as List<dynamic>;
+      apkDetailsList = json.map((e) {
+        var apkUrlsFromAssets = (e['assets']?['links'] as List<dynamic>? ?? [])
+            .map((e) {
+              return (e['direct_asset_url'] ?? e['url'] ?? '') as String;
+            })
+            .where((s) => s.isNotEmpty)
+            .toList();
+        List<String> uploadedAPKsFromDescription =
+            ((e['description'] ?? '') as String)
+                .split('](')
+                .join('\n')
+                .split('.apk)')
+                .join('.apk\n')
+                .split('\n')
+                .where((s) => s.startsWith('/uploads/') && s.endsWith('apk'))
+                .map((s) => '$standardUrl$s')
+                .toList();
+        var apkUrlsSet = apkUrlsFromAssets.toSet();
+        apkUrlsSet.addAll(uploadedAPKsFromDescription);
+        var releaseDateString = e['released_at'] ?? e['created_at'];
+        DateTime? releaseDate = releaseDateString != null
+            ? DateTime.parse(releaseDateString)
+            : null;
+        return APKDetails(
+            e['tag_name'] ?? e['name'],
+            getApkUrlsFromUrls(apkUrlsSet.toList()),
+            GitHub().getAppNames(standardUrl),
+            releaseDate: releaseDate);
+      });
+    } else {
+      Response res = await sourceRequest('$standardUrl/-/tags?format=atom');
+      if (res.statusCode != 200) {
+        throw getObtainiumHttpError(res);
+      }
       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 entryId = entry?.querySelector('id')?.innerHtml;
-      var version =
-          entryId == null ? null : Uri.parse(entryId).pathSegments.last;
-      if (version == null) {
-        throw NoVersionError();
-      }
-      return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl));
-    } else {
-      throw getObtainiumHttpError(res);
+      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();
+        }
+        return APKDetails(version, getApkUrlsFromUrls(apkUrls),
+            GitHub().getAppNames(standardUrl),
+            releaseDate: releaseDate);
+      });
     }
+    if (apkDetailsList.isEmpty) {
+      throw NoReleasesError();
+    }
+    if (fallbackToOlderReleases) {
+      if (additionalSettings['trackOnly'] != true) {
+        apkDetailsList =
+            apkDetailsList.where((e) => e.apkUrls.isNotEmpty).toList();
+      }
+      if (apkDetailsList.isEmpty) {
+        throw NoReleasesError();
+      }
+    }
+    return apkDetailsList.first;
   }
 }

lib/app_sources/html.dart

@@ -1,17 +1,162 @@
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
+String ensureAbsoluteUrl(String ambiguousUrl, Uri referenceAbsoluteUrl) {
+  try {
+    Uri.parse(ambiguousUrl).origin;
+    return ambiguousUrl;
+  } catch (err) {
+    // is relative
+  }
+  var currPathSegments = referenceAbsoluteUrl.path
+      .split('/')
+      .where((element) => element.trim().isNotEmpty)
+      .toList();
+  if (ambiguousUrl.startsWith('/') || currPathSegments.isEmpty) {
+    return '${referenceAbsoluteUrl.origin}/$ambiguousUrl';
+  } else if (ambiguousUrl.split('/').where((e) => e.isNotEmpty).length == 1) {
+    return '${referenceAbsoluteUrl.origin}/${currPathSegments.join('/')}/$ambiguousUrl';
+  } else {
+    return '${referenceAbsoluteUrl.origin}/${currPathSegments.sublist(0, currPathSegments.length - (currPathSegments.last.contains('.') ? 1 : 0)).join('/')}/$ambiguousUrl';
+  }
+}
+
+int compareAlphaNumeric(String a, String b) {
+  List<String> aParts = _splitAlphaNumeric(a);
+  List<String> bParts = _splitAlphaNumeric(b);
+
+  for (int i = 0; i < aParts.length && i < bParts.length; i++) {
+    String aPart = aParts[i];
+    String bPart = bParts[i];
+
+    bool aIsNumber = _isNumeric(aPart);
+    bool bIsNumber = _isNumeric(bPart);
+
+    if (aIsNumber && bIsNumber) {
+      int aNumber = int.parse(aPart);
+      int bNumber = int.parse(bPart);
+      int cmp = aNumber.compareTo(bNumber);
+      if (cmp != 0) {
+        return cmp;
+      }
+    } else if (!aIsNumber && !bIsNumber) {
+      int cmp = aPart.compareTo(bPart);
+      if (cmp != 0) {
+        return cmp;
+      }
+    } else {
+      // Alphanumeric strings come before numeric strings
+      return aIsNumber ? 1 : -1;
+    }
+  }
+
+  return aParts.length.compareTo(bParts.length);
+}
+
+List<String> _splitAlphaNumeric(String s) {
+  List<String> parts = [];
+  StringBuffer sb = StringBuffer();
+
+  bool isNumeric = _isNumeric(s[0]);
+  sb.write(s[0]);
+
+  for (int i = 1; i < s.length; i++) {
+    bool currentIsNumeric = _isNumeric(s[i]);
+    if (currentIsNumeric == isNumeric) {
+      sb.write(s[i]);
+    } else {
+      parts.add(sb.toString());
+      sb.clear();
+      sb.write(s[i]);
+      isNumeric = currentIsNumeric;
+    }
+  }
+
+  parts.add(sb.toString());
+
+  return parts;
+}
+
+bool _isNumeric(String s) {
+  return s.codeUnitAt(0) >= 48 && s.codeUnitAt(0) <= 57;
+}
+
 class HTML extends AppSource {
-  @override
-  String standardizeURL(String url) {
-    return url;
+  HTML() {
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('sortByFileNamesNotLinks',
+            label: tr('sortByFileNamesNotLinks'))
+      ],
+      [GeneratedFormSwitch('reverseSort', label: tr('reverseSort'))],
+      [
+        GeneratedFormTextField('customLinkFilterRegex',
+            label: tr('customLinkFilterRegex'),
+            hint: 'download/(.*/)?(android|apk|mobile)',
+            required: false,
+            additionalValidators: [
+              (value) {
+                return regExValidator(value);
+              }
+            ])
+      ],
+      [
+        GeneratedFormTextField('intermediateLinkRegex',
+            label: tr('intermediateLinkRegex'),
+            hint: '([0-9]+.)*[0-9]+/\$',
+            required: false,
+            additionalValidators: [(value) => regExValidator(value)])
+      ],
+      [
+        GeneratedFormTextField('versionExtractionRegEx',
+            label: tr('versionExtractionRegEx'),
+            required: false,
+            additionalValidators: [(value) => regExValidator(value)]),
+      ],
+      [
+        GeneratedFormTextField('matchGroupToUse',
+            label: tr('matchGroupToUse'),
+            required: false,
+            hint: '0',
+            textInputType: const TextInputType.numberWithOptions(),
+            additionalValidators: [
+              (value) {
+                if (value?.isEmpty == true) {
+                  value = null;
+                }
+                value ??= '0';
+                return intValidator(value);
+              }
+            ])
+      ],
+      [
+        GeneratedFormSwitch('versionExtractWholePage',
+            label: tr('versionExtractWholePage'))
+      ]
+    ];
+    overrideVersionDetectionFormDefault('noVersionDetection',
+        disableStandard: true, disableRelDate: true);
   }
 
   @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
+  Future<Map<String, String>?> getRequestHeaders(
+      {Map<String, dynamic> additionalSettings = const <String, dynamic>{},
+      bool forAPKDownload = false}) async {
+    return {
+      "User-Agent":
+          "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36"
+    };
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    return url;
+  }
 
   @override
   Future<APKDetails> getLatestAPKDetails(
@@ -19,27 +164,89 @@ class HTML extends AppSource {
     Map<String, dynamic> additionalSettings,
   ) async {
     var uri = Uri.parse(standardUrl);
-    Response res = await get(uri);
+    Response res = await sourceRequest(standardUrl);
     if (res.statusCode == 200) {
-      List<String> links = parse(res.body)
+      var html = parse(res.body);
+      List<String> allLinks = html
           .querySelectorAll('a')
           .map((element) => element.attributes['href'] ?? '')
-          .where((element) => element.toLowerCase().endsWith('.apk'))
+          .where((element) => element.isNotEmpty)
           .toList();
-      links.sort((a, b) => a.split('/').last.compareTo(b.split('/').last));
+      if (allLinks.isEmpty) {
+        allLinks = RegExp(
+                r'(http|ftp|https)://([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?')
+            .allMatches(res.body)
+            .map((match) => match.group(0)!)
+            .toList();
+      }
+      List<String> links = [];
+      if ((additionalSettings['intermediateLinkRegex'] as String?)
+              ?.isNotEmpty ==
+          true) {
+        var reg = RegExp(additionalSettings['intermediateLinkRegex']);
+        links = allLinks.where((element) => reg.hasMatch(element)).toList();
+        links.sort((a, b) => compareAlphaNumeric(a, b));
+        if (links.isEmpty) {
+          throw ObtainiumError(tr('intermediateLinkNotFound'));
+        }
+        Map<String, dynamic> additionalSettingsTemp =
+            Map.from(additionalSettings);
+        additionalSettingsTemp['intermediateLinkRegex'] = null;
+        return getLatestAPKDetails(
+            ensureAbsoluteUrl(links.last, uri), additionalSettingsTemp);
+      }
+      if ((additionalSettings['customLinkFilterRegex'] as String?)
+              ?.isNotEmpty ==
+          true) {
+        var reg = RegExp(additionalSettings['customLinkFilterRegex']);
+        links = allLinks.where((element) => reg.hasMatch(element)).toList();
+      } else {
+        links = allLinks
+            .where((element) =>
+                Uri.parse(element).path.toLowerCase().endsWith('.apk'))
+            .toList();
+      }
+      links.sort((a, b) => additionalSettings['sortByFileNamesNotLinks'] == true
+          ? compareAlphaNumeric(a.split('/').where((e) => e.isNotEmpty).last,
+              b.split('/').where((e) => e.isNotEmpty).last)
+          : compareAlphaNumeric(a, b));
+      if (additionalSettings['reverseSort'] == true) {
+        links = links.reversed.toList();
+      }
+      if ((additionalSettings['apkFilterRegEx'] as String?)?.isNotEmpty ==
+          true) {
+        var reg = RegExp(additionalSettings['apkFilterRegEx']);
+        links = links.where((element) => reg.hasMatch(element)).toList();
+      }
       if (links.isEmpty) {
         throw NoReleasesError();
       }
       var rel = links.last;
-      var apkName = rel.split('/').last;
-      var version = apkName.substring(0, apkName.length - 4);
-      List<String> apkUrls = [rel]
-          .map((e) => e.toLowerCase().startsWith('http://') ||
-                  e.toLowerCase().startsWith('https://')
-              ? e
-              : '${uri.origin}/$e')
-          .toList();
-      return APKDetails(version, apkUrls, AppNames(uri.host, tr('app')));
+      String? version = rel.hashCode.toString();
+      var versionExtractionRegEx =
+          additionalSettings['versionExtractionRegEx'] as String?;
+      if (versionExtractionRegEx?.isNotEmpty == true) {
+        var match = RegExp(versionExtractionRegEx!).allMatches(
+            additionalSettings['versionExtractWholePage'] == true
+                ? res.body.split('\r\n').join('\n').split('\n').join('\\n')
+                : rel);
+        if (match.isEmpty) {
+          throw NoVersionError();
+        }
+        String matchGroupString =
+            (additionalSettings['matchGroupToUse'] as String).trim();
+        if (matchGroupString.isEmpty) {
+          matchGroupString = "0";
+        }
+        version = match.last.group(int.parse(matchGroupString));
+        if (version?.isEmpty == true) {
+          throw NoVersionError();
+        }
+      }
+      List<String> apkUrls =
+          [rel].map((e) => ensureAbsoluteUrl(e, uri)).toList();
+      return APKDetails(version!, apkUrls.map((e) => MapEntry(e, e)).toList(),
+          AppNames(uri.host, tr('app')));
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/huaweiappgallery.dart

@@ -0,0 +1,91 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class HuaweiAppGallery extends AppSource {
+  HuaweiAppGallery() {
+    name = 'Huawei AppGallery';
+    host = 'appgallery.huawei.com';
+    overrideVersionDetectionFormDefault('releaseDateAsVersion',
+        disableStandard: true);
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/app/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  getDlUrl(String standardUrl) =>
+      'https://${host!.replaceAll('appgallery.', 'appgallery.cloud.')}/appdl/${standardUrl.split('/').last}';
+
+  requestAppdlRedirect(String dlUrl) async {
+    Response res = await sourceRequest(dlUrl, followRedirects: false);
+    if (res.statusCode == 200 ||
+        res.statusCode == 302 ||
+        res.statusCode == 304) {
+      return res;
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+
+  appIdFromRedirectDlUrl(String redirectDlUrl) {
+    var parts = redirectDlUrl
+        .split('?')[0]
+        .split('/')
+        .last
+        .split('.')
+        .reversed
+        .toList();
+    parts.removeAt(0);
+    parts.removeAt(0);
+    return parts.reversed.join('.');
+  }
+
+  @override
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
+    String dlUrl = getDlUrl(standardUrl);
+    Response res = await requestAppdlRedirect(dlUrl);
+    return res.headers['location'] != null
+        ? appIdFromRedirectDlUrl(res.headers['location']!)
+        : null;
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    String dlUrl = getDlUrl(standardUrl);
+    Response res = await requestAppdlRedirect(dlUrl);
+    if (res.headers['location'] == null) {
+      throw NoReleasesError();
+    }
+    String appId = appIdFromRedirectDlUrl(res.headers['location']!);
+    var relDateStr =
+        res.headers['location']?.split('?')[0].split('.').reversed.toList()[1];
+    var relDateStrAdj = relDateStr?.split('');
+    var tempLen = relDateStrAdj?.length ?? 0;
+    var i = 2;
+    while (i < tempLen) {
+      relDateStrAdj?.insert((i + i ~/ 2 - 1), '-');
+      i += 2;
+    }
+    var relDate = relDateStrAdj == null
+        ? null
+        : DateFormat('yy-MM-dd-HH-mm').parse(relDateStrAdj.join(''));
+    if (relDateStr == null) {
+      throw NoVersionError();
+    }
+    return APKDetails(
+        relDateStr, [MapEntry('$appId.apk', dlUrl)], AppNames(name, appId),
+        releaseDate: relDate);
+  }
+}

lib/app_sources/izzyondroid.dart

@@ -1,17 +1,27 @@
-import 'package:http/http.dart';
 import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
 class IzzyOnDroid extends AppSource {
+  late FDroid fd;
+
   IzzyOnDroid() {
-    host = 'android.izzysoft.de';
+    host = 'izzysoft.de';
+    fd = FDroid();
+    additionalSourceAppSpecificSettingFormItems =
+        fd.additionalSourceAppSpecificSettingFormItems;
+    allowSubDomains = true;
   }
 
   @override
-  String standardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/repo/apk/[^/]+');
-    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegExA = RegExp('^https?://android.$host/repo/apk/[^/]+');
+    RegExpMatch? match = standardUrlRegExA.firstMatch(url.toLowerCase());
+    if (match == null) {
+      RegExp standardUrlRegExB =
+          RegExp('^https?://apt.$host/fdroid/index/apk/[^/]+');
+      match = standardUrlRegExB.firstMatch(url.toLowerCase());
+    }
     if (match == null) {
       throw InvalidURLError(name);
     }
@@ -19,12 +29,9 @@ class IzzyOnDroid extends AppSource {
   }
 
   @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
-  @override
-  String? tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) {
-    return FDroid().tryInferringAppId(standardUrl);
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
+    return fd.tryInferringAppId(standardUrl);
   }
 
   @override
@@ -32,11 +39,17 @@ class IzzyOnDroid extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    String? appId = tryInferringAppId(standardUrl);
-    return FDroid().getAPKUrlsFromFDroidPackagesAPIResponse(
-        await get(
-            Uri.parse('https://apt.izzysoft.de/fdroid/api/v1/packages/$appId')),
+    String? appId = await tryInferringAppId(standardUrl);
+    return getAPKUrlsFromFDroidPackagesAPIResponse(
+        await sourceRequest(
+            'https://apt.izzysoft.de/fdroid/api/v1/packages/$appId'),
         'https://android.izzysoft.de/frepo/$appId',
-        standardUrl);
+        standardUrl,
+        name,
+        autoSelectHighestVersionCode:
+            additionalSettings['autoSelectHighestVersionCode'] == true,
+        trySelectingSuggestedVersionCode:
+            additionalSettings['trySelectingSuggestedVersionCode'] == true,
+        filterVersionsByRegEx: additionalSettings['filterVersionsByRegEx']);
   }
 }

lib/app_sources/jenkins.dart

@@ -0,0 +1,67 @@
+import 'dart:convert';
+
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class Jenkins extends AppSource {
+  Jenkins() {
+    overrideVersionDetectionFormDefault('releaseDateAsVersion',
+        disableStandard: true);
+  }
+
+  String trimJobUrl(String url) {
+    RegExp standardUrlRegEx = RegExp('.*/job/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url);
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) =>
+      '$standardUrl/-/releases';
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    standardUrl = trimJobUrl(standardUrl);
+    Response res =
+        await sourceRequest('$standardUrl/lastSuccessfulBuild/api/json');
+    if (res.statusCode == 200) {
+      var json = jsonDecode(res.body);
+      var releaseDate = json['timestamp'] == null
+          ? null
+          : DateTime.fromMillisecondsSinceEpoch(json['timestamp'] as int);
+      var version =
+          json['number'] == null ? null : (json['number'] as int).toString();
+      if (version == null) {
+        throw NoVersionError();
+      }
+      var apkUrls = (json['artifacts'] as List<dynamic>)
+          .map((e) {
+            var path = (e['relativePath'] as String?);
+            if (path != null && path.isNotEmpty) {
+              path = '$standardUrl/lastSuccessfulBuild/artifact/$path';
+            }
+            return path == null
+                ? const MapEntry<String, String>('', '')
+                : MapEntry<String, String>(
+                    (e['fileName'] ?? e['relativePath']) as String, path);
+          })
+          .where((url) =>
+              url.value.isNotEmpty && url.key.toLowerCase().endsWith('.apk'))
+          .toList();
+      return APKDetails(
+          version,
+          apkUrls,
+          releaseDate: releaseDate,
+          AppNames(Uri.parse(standardUrl).host, standardUrl.split('/').last));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/app_sources/mullvad.dart

@@ -1,5 +1,6 @@
 import 'package:html/parser.dart';
 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';
 
@@ -9,7 +10,7 @@ class Mullvad extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
@@ -27,21 +28,39 @@ class Mullvad extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    Response res = await get(Uri.parse('$standardUrl/en/download/android'));
+    Response res = await sourceRequest('$standardUrl/en/download/android');
     if (res.statusCode == 200) {
-      var version = parse(res.body)
-          .querySelector('p.subtitle.is-6')
-          ?.querySelector('a')
-          ?.attributes['href']
-          ?.split('/')
-          .last;
-      if (version == null) {
+      var versions = parse(res.body)
+          .querySelectorAll('p')
+          .map((e) => e.innerHtml)
+          .where((p) => p.contains('Latest version: '))
+          .map((e) {
+            var match = RegExp('[0-9]+(\\.[0-9]+)*').firstMatch(e);
+            if (match == null) {
+              return '';
+            } else {
+              return e.substring(match.start, match.end);
+            }
+          })
+          .where((element) => element.isNotEmpty)
+          .toList();
+      if (versions.isEmpty) {
         throw NoVersionError();
       }
+      String? changeLog;
+      try {
+        changeLog = (await GitHub().getLatestAPKDetails(
+                'https://github.com/mullvad/mullvadvpn-app',
+                {'fallbackToOlderReleases': true}))
+            .changeLog;
+      } catch (e) {
+        // Ignore
+      }
       return APKDetails(
-          version,
-          ['https://mullvad.net/download/app/apk/latest'],
-          AppNames(name, 'Mullvad-VPN'));
+          versions[0],
+          getApkUrlsFromUrls(['https://mullvad.net/download/app/apk/latest']),
+          AppNames(name, 'Mullvad-VPN'),
+          changeLog: changeLog);
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/neutroncode.dart

@@ -0,0 +1,111 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class NeutronCode extends AppSource {
+  NeutronCode() {
+    host = 'neutroncode.com';
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/downloads/file/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => standardUrl;
+
+  String monthNameToNumberString(String s) {
+    switch (s.toLowerCase()) {
+      case 'january':
+        return '01';
+      case 'february':
+        return '02';
+      case 'march':
+        return '03';
+      case 'april':
+        return '04';
+      case 'may':
+        return '05';
+      case 'june':
+        return '06';
+      case 'july':
+        return '07';
+      case 'august':
+        return '08';
+      case 'september':
+        return '09';
+      case 'october':
+        return '10';
+      case 'november':
+        return '11';
+      case 'december':
+        return '12';
+      default:
+        throw ArgumentError('Invalid month name: $s');
+    }
+  }
+
+  customDateParse(String dateString) {
+    List<String> parts = dateString.split(' ');
+    if (parts.length != 3) {
+      return null;
+    }
+    String result = '';
+    for (var s in parts.reversed) {
+      try {
+        try {
+          int.parse(s);
+          result += '$s-';
+        } catch (e) {
+          result += '${monthNameToNumberString(s)}-';
+        }
+      } catch (e) {
+        return null;
+      }
+    }
+    return result.substring(0, result.length - 1);
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    Response res = await sourceRequest(standardUrl);
+    if (res.statusCode == 200) {
+      var http = parse(res.body);
+      var name = http.querySelector('.pd-title')?.innerHtml;
+      var filename = http.querySelector('.pd-filename .pd-float')?.innerHtml;
+      if (filename == null) {
+        throw NoReleasesError();
+      }
+      var version =
+          http.querySelector('.pd-version-txt')?.nextElementSibling?.innerHtml;
+      if (version == null) {
+        throw NoVersionError();
+      }
+      String? apkUrl = 'https://$host/download/$filename';
+      var dateStringOriginal =
+          http.querySelector('.pd-date-txt')?.nextElementSibling?.innerHtml;
+      var dateString = dateStringOriginal != null
+          ? (customDateParse(dateStringOriginal))
+          : null;
+      var changeLogElements = http.querySelectorAll('.pd-fdesc p');
+      return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
+          AppNames(runtimeType.toString(), name ?? standardUrl.split('/').last),
+          releaseDate: dateString != null ? DateTime.parse(dateString) : null,
+          changeLog: changeLogElements.isNotEmpty
+              ? changeLogElements.last.innerHtml
+              : null);
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/app_sources/signal.dart

@@ -9,20 +9,17 @@ class Signal extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     return 'https://$host';
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
     Response res =
-        await get(Uri.parse('https://updates.$host/android/latest.json'));
+        await sourceRequest('https://updates.$host/android/latest.json');
     if (res.statusCode == 200) {
       var json = jsonDecode(res.body);
       String? apkUrl = json['url'];
@@ -31,7 +28,8 @@ class Signal extends AppSource {
       if (version == null) {
         throw NoVersionError();
       }
-      return APKDetails(version, apkUrls, AppNames(name, 'Signal'));
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames(name, 'Signal'));
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/sourceforge.dart

@@ -9,24 +9,27 @@ class SourceForge extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/projects/[^/]+');
-    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegExB = RegExp('^https?://$host/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)}';
+    }
+    RegExp standardUrlRegExA = RegExp('^https?://$host/projects/[^/]+');
+    match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }
     return url.substring(0, match.end);
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    Response res = await get(Uri.parse('$standardUrl/rss?path=/'));
+    Response res = await sourceRequest('$standardUrl/rss?path=/');
     if (res.statusCode == 200) {
       var parsedHtml = parse(res.body);
       var allDownloadLinks =
@@ -34,7 +37,8 @@ class SourceForge extends AppSource {
       getVersion(String url) {
         try {
           var tokens = url.split('/');
-          return tokens[tokens.length - 3];
+          var fi = tokens.indexOf('files');
+          return tokens[tokens[fi + 2] == 'download' ? fi - 1 : fi + 1];
         } catch (e) {
           return null;
         }
@@ -53,7 +57,7 @@ class SourceForge extends AppSource {
               .toList();
       return APKDetails(
           version,
-          apkUrlList,
+          getApkUrlsFromUrls(apkUrlList),
           AppNames(
               name, standardUrl.substring(standardUrl.lastIndexOf('/') + 1)));
     } else {

lib/app_sources/sourcehut.dart

@@ -0,0 +1,107 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/app_sources/html.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 SourceHut extends AppSource {
+  SourceHut() {
+    host = 'git.sr.ht';
+
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ]
+    ];
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => standardUrl;
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    Uri standardUri = Uri.parse(standardUrl);
+    String appName = standardUri.pathSegments.last;
+    bool fallbackToOlderReleases =
+        additionalSettings['fallbackToOlderReleases'] == true;
+    Response res = await sourceRequest('$standardUrl/refs/rss.xml');
+    if (res.statusCode == 200) {
+      var parsedHtml = parse(res.body);
+      List<APKDetails> apkDetailsList = [];
+      int ind = 0;
+
+      for (var entry in parsedHtml.querySelectorAll('item').sublist(0, 6)) {
+        // Limit 5 for speed
+        if (!fallbackToOlderReleases && ind > 0) {
+          break;
+        }
+        String? version = entry.querySelector('title')?.text.trim();
+        if (version == null) {
+          throw NoVersionError();
+        }
+        String? releaseDateString = entry.querySelector('pubDate')?.innerHtml;
+        String releasePage = '$standardUrl/refs/$version';
+        DateTime? releaseDate;
+        try {
+          releaseDate = releaseDateString != null
+              ? DateFormat('E, dd MMM yyyy HH:mm:ss Z').parse(releaseDateString)
+              : null;
+          releaseDate = releaseDateString != null
+              ? DateFormat('EEE, dd MMM yyyy HH:mm:ss Z')
+                  .parse(releaseDateString)
+              : null;
+        } catch (e) {
+          // ignore
+        }
+        var res2 = await sourceRequest(releasePage);
+        List<MapEntry<String, String>> apkUrls = [];
+        if (res2.statusCode == 200) {
+          apkUrls = getApkUrlsFromUrls(parse(res2.body)
+              .querySelectorAll('a')
+              .map((e) => e.attributes['href'] ?? '')
+              .where((e) => e.toLowerCase().endsWith('.apk'))
+              .map((e) => ensureAbsoluteUrl(e, standardUri))
+              .toList());
+        }
+        apkDetailsList.add(APKDetails(
+            version,
+            apkUrls,
+            AppNames(entry.querySelector('author')?.innerHtml.trim() ?? appName,
+                appName),
+            releaseDate: releaseDate));
+        ind++;
+      }
+      if (apkDetailsList.isEmpty) {
+        throw NoReleasesError();
+      }
+      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);
+    }
+  }
+}

lib/app_sources/steammobile.dart

@@ -10,32 +10,33 @@ class SteamMobile extends AppSource {
     host = 'store.steampowered.com';
     name = tr('steam');
     additionalSourceAppSpecificSettingFormItems = [
-      [GeneratedFormDropdown('app', apks.entries.toList(), label: tr('app'))]
+      [
+        GeneratedFormDropdown('app', apks.entries.toList(),
+            label: tr('app'), defaultValue: apks.entries.toList()[0].key)
+      ]
     ];
   }
 
   final apks = {'steam': tr('steamMobile'), 'steam-chat-app': tr('steamChat')};
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     return 'https://$host';
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    Response res = await get(Uri.parse('https://$host/mobile'));
+    Response res = await sourceRequest('https://$host/mobile');
     if (res.statusCode == 200) {
       var apkNamePrefix = additionalSettings['app'] as String?;
       if (apkNamePrefix == null) {
         throw NoReleasesError();
       }
-      String apkInURLRegexPattern = '/$apkNamePrefix-[^/]+\\.apk\$';
+      String apkInURLRegexPattern =
+          '/$apkNamePrefix-([0-9]+\\.)*[0-9]+\\.apk\$';
       var links = parse(res.body)
           .querySelectorAll('a')
           .map((e) => e.attributes['href'] ?? '')
@@ -52,7 +53,8 @@ class SteamMobile extends AppSource {
       var version = links[0].substring(
           versionMatch.start + apkNamePrefix.length + 2, versionMatch.end - 4);
       var apkUrls = [links[0]];
-      return APKDetails(version, apkUrls, AppNames(name, apks[apkNamePrefix]!));
+      return APKDetails(version, getApkUrlsFromUrls(apkUrls),
+          AppNames(name, apks[apkNamePrefix]!));
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/telegramapp.dart

@@ -0,0 +1,41 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class TelegramApp extends AppSource {
+  TelegramApp() {
+    host = 'telegram.org';
+    name = 'Telegram ${tr('app')}';
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    return 'https://$host';
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    Response res = await sourceRequest('https://t.me/s/TAndroidAPK');
+    if (res.statusCode == 200) {
+      var http = parse(res.body);
+      var messages =
+          http.querySelectorAll('.tgme_widget_message_text.js-message_text');
+      var version = messages.isNotEmpty
+          ? messages.last.innerHtml.split('\n').first.trim().split(' ').first
+          : null;
+      if (version == null) {
+        throw NoVersionError();
+      }
+      String? apkUrl = 'https://telegram.org/dl/android/apk';
+      return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
+          AppNames('Telegram', 'Telegram'));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/app_sources/uptodown.dart

@@ -0,0 +1,99 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
+import 'package:obtainium/app_sources/apkpure.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class Uptodown extends AppSource {
+  Uptodown() {
+    host = 'uptodown.com';
+    allowSubDomains = true;
+    naiveStandardVersionDetection = true;
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://([^\\.]+\\.){2,}$host');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return '${url.substring(0, match.end)}/android/download';
+  }
+
+  @override
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
+    return (await getAppDetailsFromPage(standardUrl))['appId'];
+  }
+
+  Future<Map<String, String?>> getAppDetailsFromPage(String standardUrl) async {
+    var res = await sourceRequest(standardUrl);
+    if (res.statusCode != 200) {
+      throw getObtainiumHttpError(res);
+    }
+    var html = parse(res.body);
+    String? version = html.querySelector('div.version')?.innerHtml;
+    String? apkUrl =
+        '${standardUrl.split('/').reversed.toList().sublist(1).reversed.join('/')}/post-download';
+    String? name = html.querySelector('#detail-app-name')?.innerHtml.trim();
+    String? author = html.querySelector('#author-link')?.innerHtml.trim();
+    var detailElements = html.querySelectorAll('#technical-information td');
+    String? appId = (detailElements.elementAtOrNull(2))?.innerHtml.trim();
+    String? dateStr = (detailElements.elementAtOrNull(29))?.innerHtml.trim();
+    return Map.fromEntries([
+      MapEntry('version', version),
+      MapEntry('apkUrl', apkUrl),
+      MapEntry('appId', appId),
+      MapEntry('name', name),
+      MapEntry('author', author),
+      MapEntry('dateStr', dateStr)
+    ]);
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    var appDetails = await getAppDetailsFromPage(standardUrl);
+    var version = appDetails['version'];
+    var apkUrl = appDetails['apkUrl'];
+    var appId = appDetails['appId'];
+    if (version == null) {
+      throw NoVersionError();
+    }
+    if (apkUrl == null) {
+      throw NoAPKError();
+    }
+    if (appId == null) {
+      throw NoReleasesError();
+    }
+    String appName = appDetails['name'] ?? tr('app');
+    String author = appDetails['author'] ?? name;
+    String? dateStr = appDetails['dateStr'];
+    DateTime? relDate;
+    if (dateStr != null) {
+      relDate = parseDateTimeMMMddCommayyyy(dateStr);
+    }
+    return APKDetails(
+        version, getApkUrlsFromUrls([apkUrl]), AppNames(author, appName),
+        releaseDate: relDate);
+  }
+
+  @override
+  Future<String> apkUrlPrefetchModifier(
+      String apkUrl, String standardUrl) async {
+    var res = await sourceRequest(apkUrl);
+    if (res.statusCode != 200) {
+      throw getObtainiumHttpError(res);
+    }
+    var html = parse(res.body);
+    var finalUrlKey =
+        html.querySelector('.post-download')?.attributes['data-url'];
+    if (finalUrlKey == null) {
+      throw NoAPKError();
+    }
+    return 'https://dw.$host/dwn/$finalUrlKey';
+  }
+}

lib/app_sources/vlc.dart

@@ -0,0 +1,108 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/app_sources/html.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class VLC extends AppSource {
+  VLC() {
+    host = 'videolan.org';
+  }
+  get dwUrlBase => 'https://get.$host/vlc-android/';
+
+  @override
+  Future<Map<String, String>?> getRequestHeaders(
+          {Map<String, dynamic> additionalSettings = const <String, dynamic>{},
+          bool forAPKDownload = false}) =>
+      HTML().getRequestHeaders(
+          additionalSettings: additionalSettings,
+          forAPKDownload: forAPKDownload);
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    return 'https://$host';
+  }
+
+  Future<String?> getLatestVersion(String standardUrl) async {
+    Response res = await sourceRequest(dwUrlBase);
+    if (res.statusCode == 200) {
+      var dwLinks = parse(res.body)
+          .querySelectorAll('a')
+          .where((element) => element.attributes['href'] != 'last/')
+          .map((e) => e.attributes['href']?.split('/')[0])
+          .toList();
+      String? version = dwLinks.isNotEmpty ? dwLinks.last : null;
+      if (version == null) {
+        throw NoVersionError();
+      }
+      return version;
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    Response res = await get(
+        Uri.parse('https://www.videolan.org/vlc/download-android.html'));
+    if (res.statusCode == 200) {
+      var dwUrlBase = 'get.videolan.org/vlc-android';
+      var dwLinks = parse(res.body)
+          .querySelectorAll('a')
+          .where((element) =>
+              element.attributes['href']?.contains(dwUrlBase) ?? false)
+          .toList();
+      String? version = dwLinks.isNotEmpty
+          ? dwLinks.first.attributes['href']
+              ?.split('/')
+              .where((s) => s.isNotEmpty)
+              .last
+          : null;
+      if (version == null) {
+        throw NoVersionError();
+      }
+      String? targetUrl = 'https://$dwUrlBase/$version/';
+      var apkUrls = ['arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64']
+          .map((e) => '${targetUrl}VLC-Android-$version-$e.apk')
+          .toList();
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames('VideoLAN', 'VLC'));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+
+  @override
+  Future<String> apkUrlPrefetchModifier(
+      String apkUrl, String standardUrl) async {
+    Response res = await sourceRequest(apkUrl);
+    if (res.statusCode == 200) {
+      String? apkUrl =
+          parse(res.body).querySelector('#alt_link')?.attributes['href'];
+      if (apkUrl == null) {
+        throw NoAPKError();
+      }
+      return apkUrl;
+    } else if (res.statusCode == 500 &&
+        res.body.toLowerCase().indexOf('mirror') > 0) {
+      var html = parse(res.body);
+      var err = '';
+      html.body?.nodes.forEach((element) {
+        if (element.text != null) {
+          err += '${element.text}\n';
+        }
+      });
+      err = err.trim();
+      if (err.isEmpty) {
+        err = tr('err');
+      }
+      throw ObtainiumError(err);
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/app_sources/whatsapp.dart

@@ -0,0 +1,53 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class WhatsApp extends AppSource {
+  WhatsApp() {
+    host = 'whatsapp.com';
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    return 'https://$host';
+  }
+
+  @override
+  Future<String> apkUrlPrefetchModifier(
+      String apkUrl, String standardUrl) async {
+    Response res = await sourceRequest('$standardUrl/android');
+    if (res.statusCode == 200) {
+      var targetLinks = parse(res.body)
+          .querySelectorAll('a')
+          .map((e) => e.attributes['href'] ?? '')
+          .where((e) => e.isNotEmpty)
+          .where((e) => e.contains('WhatsApp.apk'))
+          .toList();
+      if (targetLinks.isEmpty) {
+        throw NoAPKError();
+      }
+      return targetLinks[0];
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    // This is a CDN link that is consistent per version
+    // But it has query params that change constantly
+    Uri apkUri =
+        Uri.parse(await apkUrlPrefetchModifier(standardUrl, standardUrl));
+    var unusableApkUrl = '${apkUri.origin}/${apkUri.path}';
+    // So we use the param-less URL is a pseudo-version to add the app and check for updates
+    // See #357 for why we can't scrape the version number directly
+    // But we re-fetch the URL again with its latest query params at the actual download time
+    String version = unusableApkUrl.hashCode.toString();
+    return APKDetails(version, getApkUrlsFromUrls([unusableApkUrl]),
+        AppNames('Meta', 'WhatsApp'));
+  }
+}

lib/components/generated_form.dart

@@ -1,5 +1,6 @@
 import 'dart:math';
 
+import 'package:hsluv/hsluv.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
@@ -24,6 +25,7 @@ class GeneratedFormTextField extends GeneratedFormItem {
   late int max;
   late String? hint;
   late bool password;
+  late TextInputType? textInputType;
 
   GeneratedFormTextField(String key,
       {String label = 'Input',
@@ -33,7 +35,8 @@ class GeneratedFormTextField extends GeneratedFormItem {
       this.required = true,
       this.max = 1,
       this.hint,
-      this.password = false})
+      this.password = false,
+      this.textInputType})
       : super(key,
             label: label,
             belowWidgets: belowWidgets,
@@ -48,6 +51,7 @@ class GeneratedFormTextField extends GeneratedFormItem {
 
 class GeneratedFormDropdown extends GeneratedFormItem {
   late List<MapEntry<String, String>>? opts;
+  List<String>? disabledOptKeys;
 
   GeneratedFormDropdown(
     String key,
@@ -55,6 +59,7 @@ class GeneratedFormDropdown extends GeneratedFormItem {
     String label = 'Input',
     List<Widget> belowWidgets = const [],
     String defaultValue = '',
+    this.disabledOptKeys,
     List<String? Function(String? value)> additionalValidators = const [],
   }) : super(key,
             label: label,
@@ -130,19 +135,20 @@ class GeneratedForm extends StatefulWidget {
   State<GeneratedForm> createState() => _GeneratedFormState();
 }
 
-// Generates a random light color
-// Courtesy of ChatGPT 😭 (with a bugfix 🥳)
+// Generates a color in the HSLuv (Pastel) color space
+// https://pub.dev/documentation/hsluv/latest/hsluv/Hsluv/hpluvToRgb.html
 Color generateRandomLightColor() {
-  // Create a random number generator
-  final Random random = Random();
-
-  // Generate random hue, saturation, and value values
-  final double hue = random.nextDouble() * 360;
-  final double saturation = 0.5 + random.nextDouble() * 0.5;
-  final double value = 0.9 + random.nextDouble() * 0.1;
-
-  // Create a HSV color with the random values
-  return HSVColor.fromAHSV(1.0, hue, saturation, value).toColor();
+  final randomSeed = Random().nextInt(120);
+  // https://en.wikipedia.org/wiki/Golden_angle
+  final goldenAngle = 180 * (3 - sqrt(5));
+  // Generate next golden angle hue
+  final double hue = randomSeed * goldenAngle;
+  // Map from HPLuv color space to RGB, use constant saturation=100, lightness=70
+  final List<double> rgbValuesDbl = Hsluv.hpluvToRgb([hue, 100, 70]);
+  // Map RBG values from 0-1 to 0-255:
+  final List<int> rgbValues =
+      rgbValuesDbl.map((rgb) => (rgb * 255).toInt()).toList();
+  return Color.fromARGB(255, rgbValues[0], rgbValues[1], rgbValues[2]);
 }
 
 class _GeneratedFormState extends State<GeneratedForm> {
@@ -150,6 +156,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
   Map<String, dynamic> values = {};
   late List<List<Widget>> formInputs;
   List<List<Widget>> rows = [];
+  String? initKey;
 
   // If any value changes, call this to update the parent with value and validity
   void someValueChanged({bool isBuilding = false}) {
@@ -169,13 +176,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
     widget.onValueChanges(returnValues, valid, isBuilding);
   }
 
-  @override
-  void initState() {
-    super.initState();
-
+  initForm() {
+    initKey = widget.key.toString();
     // Initialize form values as all empty
     values.clear();
-    int j = 0;
     for (var row in widget.items) {
       for (var e in row) {
         values[e.key] = e.defaultValue;
@@ -189,6 +193,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
         if (formItem is GeneratedFormTextField) {
           final formFieldKey = GlobalKey<FormFieldState>();
           return TextFormField(
+            keyboardType: formItem.textInputType,
             obscureText: formItem.password,
             autocorrect: !formItem.password,
             enableSuggestions: !formItem.password,
@@ -227,10 +232,15 @@ class _GeneratedFormState extends State<GeneratedForm> {
           return DropdownButtonFormField(
               decoration: InputDecoration(labelText: formItem.label),
               value: values[formItem.key],
-              items: formItem.opts!
-                  .map((e2) =>
-                      DropdownMenuItem(value: e2.key, child: Text(e2.value)))
-                  .toList(),
+              items: formItem.opts!.map((e2) {
+                var enabled =
+                    formItem.disabledOptKeys?.contains(e2.key) != true;
+                return DropdownMenuItem(
+                    value: e2.key,
+                    enabled: enabled,
+                    child: Opacity(
+                        opacity: enabled ? 1 : 0.5, child: Text(e2.value)));
+              }).toList(),
               onChanged: (value) {
                 setState(() {
                   values[formItem.key] = value ?? formItem.opts!.first.key;
@@ -245,15 +255,27 @@ class _GeneratedFormState extends State<GeneratedForm> {
     someValueChanged(isBuilding: true);
   }
 
+  @override
+  void initState() {
+    super.initState();
+    initForm();
+  }
+
   @override
   Widget build(BuildContext context) {
+    if (widget.key.toString() != initKey) {
+      initForm();
+    }
     for (var r = 0; r < formInputs.length; r++) {
       for (var e = 0; e < formInputs[r].length; e++) {
         if (widget.items[r][e] is GeneratedFormSwitch) {
           formInputs[r][e] = Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Text(widget.items[r][e].label),
+              Flexible(child: Text(widget.items[r][e].label)),
+              const SizedBox(
+                width: 8,
+              ),
               Switch(
                   value: values[widget.items[r][e].key],
                   onChanged: (value) {
@@ -351,6 +373,39 @@ class _GeneratedFormState extends State<GeneratedForm> {
                           ));
                     }) ??
                     [const SizedBox.shrink()],
+                (values[widget.items[r][e].key]
+                                as Map<String, MapEntry<int, bool>>?)
+                            ?.values
+                            .where((e) => e.value)
+                            .length ==
+                        1
+                    ? Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 4),
+                        child: IconButton(
+                          onPressed: () {
+                            setState(() {
+                              var temp = values[widget.items[r][e].key]
+                                  as Map<String, MapEntry<int, bool>>;
+                              // get selected category str where bool is true
+                              final oldEntry = temp.entries
+                                  .firstWhere((entry) => entry.value.value);
+                              // generate new color, ensure it is not the same
+                              int newColor = oldEntry.value.key;
+                              while (oldEntry.value.key == newColor) {
+                                newColor = generateRandomLightColor().value;
+                              }
+                              // Update entry with new color, remain selected
+                              temp.update(oldEntry.key,
+                                  (old) => MapEntry(newColor, old.value));
+                              values[widget.items[r][e].key] = temp;
+                              someValueChanged();
+                            });
+                          },
+                          icon: const Icon(Icons.format_color_fill_rounded),
+                          visualDensity: VisualDensity.compact,
+                          tooltip: tr('colour'),
+                        ))
+                    : const SizedBox.shrink(),
                 (values[widget.items[r][e].key]
                                 as Map<String, MapEntry<int, bool>>?)
                             ?.values
@@ -453,10 +508,9 @@ class _GeneratedFormState extends State<GeneratedForm> {
       if (rowInputs.key > 0) {
         rows.add([
           SizedBox(
-            height: widget.items[rowInputs.key][0] is GeneratedFormSwitch &&
-                    widget.items[rowInputs.key - 1][0] is! GeneratedFormSwitch
-                ? 25
-                : 8,
+            height: widget.items[rowInputs.key - 1][0] is GeneratedFormSwitch
+                ? 8
+                : 25,
           )
         ]);
       }
@@ -470,6 +524,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
         rowItems.add(Expanded(
             child: Column(
                 crossAxisAlignment: CrossAxisAlignment.stretch,
+                mainAxisSize: MainAxisSize.min,
                 children: [
               rowInput.value,
               ...widget.items[rowInputs.key][rowInput.key].belowWidgets

lib/components/generated_form_modal.dart

@@ -11,7 +11,8 @@ class GeneratedFormModal extends StatefulWidget {
       this.initValid = false,
       this.message = '',
       this.additionalWidgets = const [],
-      this.singleNullReturnButton});
+      this.singleNullReturnButton,
+      this.primaryActionColour});
 
   final String title;
   final String message;
@@ -19,6 +20,7 @@ class GeneratedFormModal extends StatefulWidget {
   final bool initValid;
   final List<Widget> additionalWidgets;
   final String? singleNullReturnButton;
+  final Color? primaryActionColour;
 
   @override
   State<GeneratedFormModal> createState() => _GeneratedFormModalState();
@@ -71,6 +73,10 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
                 : widget.singleNullReturnButton!)),
         widget.singleNullReturnButton == null
             ? TextButton(
+                style: widget.primaryActionColour == null
+                    ? null
+                    : TextButton.styleFrom(
+                        foregroundColor: widget.primaryActionColour),
                 onPressed: !valid
                     ? null
                     : () {

lib/custom_errors.dart

@@ -1,5 +1,9 @@
+import 'dart:io';
+
+import 'package:android_package_installer/android_package_installer.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:obtainium/providers/logs_provider.dart';
 import 'package:provider/provider.dart';
 
@@ -24,12 +28,17 @@ class InvalidURLError extends ObtainiumError {
       : super(tr('invalidURLForSource', args: [sourceName]));
 }
 
+class CredsNeededError extends ObtainiumError {
+  CredsNeededError(String sourceName)
+      : super(tr('requiresCredentialsInSettings', args: [sourceName]));
+}
+
 class NoReleasesError extends ObtainiumError {
   NoReleasesError() : super(tr('noReleaseFound'));
 }
 
 class NoAPKError extends ObtainiumError {
-  NoAPKError() : super(tr('noReleaseFound'));
+  NoAPKError() : super(tr('noAPKFound'));
 }
 
 class NoVersionError extends ObtainiumError {
@@ -44,8 +53,13 @@ class DowngradeError extends ObtainiumError {
   DowngradeError() : super(tr('cantInstallOlderVersion'));
 }
 
+class InstallError extends ObtainiumError {
+  InstallError(int code)
+      : super(PackageInstallerStatus.byCode(code).name.substring(7));
+}
+
 class IDChangedError extends ObtainiumError {
-  IDChangedError() : super(tr('appIdMismatch'));
+  IDChangedError(String newId) : super('${tr('appIdMismatch')} - $newId');
 }
 
 class NotImplementedError extends ObtainiumError {
@@ -53,30 +67,43 @@ class NotImplementedError extends ObtainiumError {
 }
 
 class MultiAppMultiError extends ObtainiumError {
-  Map<String, List<String>> content = {};
+  Map<String, dynamic> rawErrors = {};
+  Map<String, List<String>> idsByErrorString = {};
+  Map<String, String> appIdNames = {};
 
   MultiAppMultiError() : super(tr('placeholder'), unexpected: true);
 
-  add(String appId, String string) {
-    var tempIds = content.remove(string);
+  add(String appId, dynamic error, {String? appName}) {
+    if (error is SocketException) {
+      error = error.message;
+    }
+    rawErrors[appId] = error;
+    var string = error.toString();
+    var tempIds = idsByErrorString.remove(string);
     tempIds ??= [];
     tempIds.add(appId);
-    content.putIfAbsent(string, () => tempIds!);
+    idsByErrorString.putIfAbsent(string, () => tempIds!);
+    if (appName != null) {
+      appIdNames[appId] = appName;
+    }
   }
 
+  String errorString(String appId, {bool includeIdsWithNames = false}) =>
+      '${appIdNames.containsKey(appId) ? '${appIdNames[appId]}${includeIdsWithNames ? ' ($appId)' : ''}' : appId}: ${rawErrors[appId].toString()}';
+
+  String errorsAppsString(String errString, List<String> appIds,
+          {bool includeIdsWithNames = false}) =>
+      '$errString [${list2FriendlyString(appIds.map((id) => appIdNames.containsKey(id) == true ? '${appIdNames[id]}${includeIdsWithNames ? ' ($id)' : ''}' : id).toList())}]';
+
   @override
-  String toString() {
-    String finalString = '';
-    for (var e in content.keys) {
-      finalString += '$e: ${content[e].toString()}\n\n';
-    }
-    return finalString;
-  }
+  String toString() => idsByErrorString.entries
+      .map((e) => errorsAppsString(e.key, e.value))
+      .join('\n\n');
 }
 
-showError(dynamic e, BuildContext context) {
+showMessage(dynamic e, BuildContext context, {bool isError = false}) {
   Provider.of<LogsProvider>(context, listen: false)
-      .add(e.toString(), level: LogLevels.error);
+      .add(e.toString(), level: isError ? LogLevels.error : LogLevels.info);
   if (e is String || (e is ObtainiumError && !e.unexpected)) {
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(content: Text(e.toString())),
@@ -88,9 +115,16 @@ showError(dynamic e, BuildContext context) {
           return AlertDialog(
             scrollable: true,
             title: Text(e is MultiAppMultiError
-                ? tr('someErrors')
-                : tr('unexpectedError')),
-            content: Text(e.toString()),
+                ? tr(isError ? 'someErrors' : 'updates')
+                : tr(isError ? 'unexpectedError' : 'unknown')),
+            content: GestureDetector(
+                onLongPress: () {
+                  Clipboard.setData(ClipboardData(text: e.toString()));
+                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                    content: Text(tr('copiedToClipboard')),
+                  ));
+                },
+                child: Text(e.toString())),
             actions: [
               TextButton(
                   onPressed: () {
@@ -103,6 +137,10 @@ showError(dynamic e, BuildContext context) {
   }
 }
 
+showError(dynamic e, BuildContext context) {
+  showMessage(e, context, isError: true);
+}
+
 String list2FriendlyString(List<String> list) {
   return list.length == 2
       ? '${list[0]} ${tr('and')} ${list[1]}'

lib/main.dart

@@ -1,9 +1,7 @@
 import 'dart:io';
-import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/pages/home.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/logs_provider.dart';
@@ -21,19 +19,29 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.10.4';
+const String currentVersion = '0.14.32';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
 const int bgUpdateCheckAlarmId = 666;
 
-const supportedLocales = [
-  Locale('en'),
-  Locale('zh'),
-  Locale('it'),
-  Locale('ja'),
-  Locale('hu'),
-  Locale('de')
+List<MapEntry<Locale, String>> supportedLocales = const [
+  MapEntry(Locale('en'), 'English'),
+  MapEntry(Locale('zh'), '简体中文'),
+  MapEntry(Locale('it'), 'Italiano'),
+  MapEntry(Locale('ja'), '日本語'),
+  MapEntry(Locale('hu'), 'Magyar'),
+  MapEntry(Locale('de'), 'Deutsch'),
+  MapEntry(Locale('fa'), 'فارسی'),
+  MapEntry(Locale('fr'), 'Français'),
+  MapEntry(Locale('es'), 'Español'),
+  MapEntry(Locale('pl'), 'Polski'),
+  MapEntry(Locale('ru'), 'Русский язык'),
+  MapEntry(Locale('bs'), 'Bosanski'),
+  MapEntry(Locale('pt'), 'Brasileiro'),
+  MapEntry(Locale('cs'), 'Česky'),
+  MapEntry(Locale('sv'), 'Svenska'),
+  MapEntry(Locale('nl'), 'Nederlands'),
 ];
 const fallbackLocale = Locale('en');
 const localeDir = 'assets/translations';
@@ -51,7 +59,7 @@ Future<void> loadTranslations() async {
     saveLocale: true,
     forceLocale: forceLocale != null ? Locale(forceLocale) : null,
     fallbackLocale: fallbackLocale,
-    supportedLocales: supportedLocales,
+    supportedLocales: supportedLocales.map((e) => e.key).toList(),
     assetLoader: const RootBundleAssetLoader(),
     useOnlyLangCode: true,
     useFallbackTranslations: true,
@@ -66,86 +74,16 @@ Future<void> loadTranslations() async {
       fallbackTranslations: controller.fallbackTranslations);
 }
 
-@pragma('vm:entry-point')
-Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
-  WidgetsFlutterBinding.ensureInitialized();
-  await EasyLocalization.ensureInitialized();
-
-  await loadTranslations();
-
-  LogsProvider logs = LogsProvider();
-  logs.add(tr('startedBgUpdateTask'));
-  int? ignoreAfterMicroseconds = params?['ignoreAfterMicroseconds'];
-  await AndroidAlarmManager.initialize();
-  DateTime? ignoreAfter = ignoreAfterMicroseconds != null
-      ? DateTime.fromMicrosecondsSinceEpoch(ignoreAfterMicroseconds)
-      : null;
-  logs.add(tr('bgUpdateIgnoreAfterIs', args: [ignoreAfter.toString()]));
-  var notificationsProvider = NotificationsProvider();
-  await notificationsProvider.notify(checkingUpdatesNotification);
-  try {
-    var appsProvider = AppsProvider();
-    await notificationsProvider.cancel(ErrorCheckingUpdatesNotification('').id);
-    await appsProvider.loadApps();
-    List<String> existingUpdateIds =
-        appsProvider.findExistingUpdates(installedOnly: true);
-    DateTime nextIgnoreAfter = DateTime.now();
-    String? err;
-    try {
-      logs.add(tr('startedActualBGUpdateCheck'));
-      await appsProvider.checkUpdates(
-          ignoreAppsCheckedAfter: ignoreAfter, throwErrorsForRetry: true);
-    } catch (e) {
-      if (e is RateLimitError || e is SocketException) {
-        var remainingMinutes = e is RateLimitError ? e.remainingMinutes : 15;
-        logs.add(plural('bgUpdateGotErrorRetryInMinutes', remainingMinutes,
-            args: [e.toString(), remainingMinutes.toString()]));
-        AndroidAlarmManager.oneShot(Duration(minutes: remainingMinutes),
-            Random().nextInt(pow(2, 31) as int), bgUpdateCheck, params: {
-          'ignoreAfterMicroseconds': nextIgnoreAfter.microsecondsSinceEpoch
-        });
-      } else {
-        err = e.toString();
-      }
-    }
-    List<App> newUpdates = appsProvider
-        .findExistingUpdates(installedOnly: true)
-        .where((id) => !existingUpdateIds.contains(id))
-        .map((e) => appsProvider.apps[e]!.app)
-        .toList();
-
-    // TODO: This silent update code doesn't work yet
-    // List<String> silentlyUpdated = await appsProvider
-    //     .downloadAndInstallLatestApp(
-    //         [...newUpdates.map((e) => e.id), ...existingUpdateIds], null);
-    // if (silentlyUpdated.isNotEmpty) {
-    //   newUpdates = newUpdates
-    //       .where((element) => !silentlyUpdated.contains(element.id))
-    //       .toList();
-    //   notificationsProvider.notify(
-    //       SilentUpdateNotification(
-    //           silentlyUpdated.map((e) => appsProvider.apps[e]!.app).toList()),
-    //       cancelExisting: true);
-    // }
-    logs.add(
-        plural('bgCheckFoundUpdatesWillNotifyIfNeeded', newUpdates.length));
-    if (newUpdates.isNotEmpty) {
-      notificationsProvider.notify(UpdateNotification(newUpdates));
-    }
-    if (err != null) {
-      throw err;
-    }
-  } catch (e) {
-    notificationsProvider
-        .notify(ErrorCheckingUpdatesNotification(e.toString()));
-  } finally {
-    logs.add(tr('bgUpdateTaskFinished'));
-    await notificationsProvider.cancel(checkingUpdatesNotification.id);
-  }
-}
-
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  try {
+    ByteData data =
+        await PlatformAssetBundle().load('assets/ca/lets-encrypt-r3.pem');
+    SecurityContext.defaultContext
+        .setTrustedCertificatesBytes(data.buffer.asUint8List());
+  } catch (e) {
+    // Already added, do nothing (see #375)
+  }
   await EasyLocalization.ensureInitialized();
   if ((await DeviceInfoPlugin().androidInfo).version.sdkInt >= 29) {
     SystemChrome.setSystemUIOverlayStyle(
@@ -162,7 +100,7 @@ void main() async {
       Provider(create: (context) => LogsProvider())
     ],
     child: EasyLocalization(
-        supportedLocales: supportedLocales,
+        supportedLocales: supportedLocales.map((e) => e.key).toList(),
         path: localeDir,
         fallbackLocale: fallbackLocale,
         useOnlyLangCode: true,
@@ -193,7 +131,7 @@ class _ObtainiumState extends State<Obtainium> {
     } else {
       bool isFirstRun = settingsProvider.checkAndFlipFirstRun();
       if (isFirstRun) {
-        logs.add(tr('firstRun'));
+        logs.add('This is the first ever run of Obtainium.');
         // If this is the first run, ask for notification permissions and add Obtainium to the Apps list
         Permission.notification.request();
         if (!fdroid) {
@@ -210,26 +148,40 @@ class _ObtainiumState extends State<Obtainium> {
                 {'includePrereleases': true},
                 null,
                 false)
-          ]);
+          ], onlyIfExists: false);
         }
       }
+      if (!supportedLocales
+              .map((e) => e.key.languageCode)
+              .contains(context.locale.languageCode) ||
+          (settingsProvider.forcedLocale == null &&
+              context.deviceLocale.languageCode !=
+                  context.locale.languageCode)) {
+        settingsProvider.resetLocaleSafe(context);
+      }
       // Register the background update task according to the user's setting
-      if (existingUpdateInterval != settingsProvider.updateInterval) {
-        if (existingUpdateInterval != -1) {
-          logs.add(tr('settingUpdateCheckIntervalTo',
-              args: [settingsProvider.updateInterval.toString()]));
-        }
-        existingUpdateInterval = settingsProvider.updateInterval;
-        if (existingUpdateInterval == 0) {
+      var actualUpdateInterval = settingsProvider.updateInterval;
+      if (existingUpdateInterval != actualUpdateInterval) {
+        if (actualUpdateInterval == 0) {
           AndroidAlarmManager.cancel(bgUpdateCheckAlarmId);
         } else {
-          AndroidAlarmManager.periodic(
-              Duration(minutes: existingUpdateInterval),
-              bgUpdateCheckAlarmId,
-              bgUpdateCheck,
-              rescheduleOnReboot: true,
-              wakeup: true);
+          var settingChanged = existingUpdateInterval != -1;
+          var lastCheckWasTooLongAgo = actualUpdateInterval != 0 &&
+              settingsProvider.lastBGCheckTime
+                  .add(Duration(minutes: actualUpdateInterval + 60))
+                  .isBefore(DateTime.now());
+          if (settingChanged || lastCheckWasTooLongAgo) {
+            logs.add(
+                'Update interval was set to ${actualUpdateInterval.toString()} (reason: ${settingChanged ? 'setting changed' : 'last check was ${settingsProvider.lastBGCheckTime.toLocal().toString()}'}).');
+            AndroidAlarmManager.periodic(
+                Duration(minutes: actualUpdateInterval),
+                bgUpdateCheckAlarmId,
+                bgUpdateCheck,
+                rescheduleOnReboot: true,
+                wakeup: true);
+          }
         }
+        existingUpdateInterval = actualUpdateInterval;
       }
     }
 
@@ -248,6 +200,14 @@ class _ObtainiumState extends State<Obtainium> {
         darkColorScheme = ColorScheme.fromSeed(
             seedColor: defaultThemeColour, brightness: Brightness.dark);
       }
+
+      // set the background and surface colors to pure black in the amoled theme
+      if (settingsProvider.useBlackTheme) {
+        darkColorScheme = darkColorScheme
+            .copyWith(background: Colors.black, surface: Colors.black)
+            .harmonized();
+      }
+
       return MaterialApp(
           title: 'Obtainium',
           localizationsDelegates: context.localizationDelegates,
@@ -266,7 +226,9 @@ class _ObtainiumState extends State<Obtainium> {
                   ? lightColorScheme
                   : darkColorScheme,
               fontFamily: 'Metropolis'),
-          home: const HomePage());
+          home: Shortcuts(shortcuts: <LogicalKeySet, Intent>{
+            LogicalKeySet(LogicalKeyboardKey.select): const ActivateIntent(),
+          }, child: const HomePage()));
     });
   }
 }

lib/mass_app_sources/githubstars.dart

@@ -13,17 +13,22 @@ class GitHubStars implements MassAppUrlSource {
   @override
   late List<String> requiredArgs = [tr('uname')];
 
-  Future<Map<String, String>> getOnePageOfUserStarredUrlsWithDescriptions(
+  Future<Map<String, List<String>>> getOnePageOfUserStarredUrlsWithDescriptions(
       String username, int page) async {
-    Response res = await get(Uri.parse(
-        'https://${await GitHub().getCredentialPrefixIfAny()}api.github.com/users/$username/starred?per_page=100&page=$page'));
+    Response res = await get(
+        Uri.parse(
+            'https://api.github.com/users/$username/starred?per_page=100&page=$page'),
+        headers: await GitHub().getRequestHeaders());
     if (res.statusCode == 200) {
-      Map<String, String> urlsWithDescriptions = {};
+      Map<String, List<String>> urlsWithDescriptions = {};
       for (var e in (jsonDecode(res.body) as List<dynamic>)) {
         urlsWithDescriptions.addAll({
-          e['html_url'] as String: e['description'] != null
-              ? e['description'] as String
-              : tr('noDescription')
+          e['html_url'] as String: [
+            e['full_name'] as String,
+            e['description'] != null
+                ? e['description'] as String
+                : tr('noDescription')
+          ]
         });
       }
       return urlsWithDescriptions;
@@ -35,11 +40,12 @@ class GitHubStars implements MassAppUrlSource {
   }
 
   @override
-  Future<Map<String, String>> getUrlsWithDescriptions(List<String> args) async {
+  Future<Map<String, List<String>>> getUrlsWithDescriptions(
+      List<String> args) async {
     if (args.length != requiredArgs.length) {
       throw ObtainiumError(tr('wrongArgNum'));
     }
-    Map<String, String> urlsWithDescriptions = {};
+    Map<String, List<String>> urlsWithDescriptions = {};
     var page = 1;
     while (true) {
       var pageUrls =

lib/pages/add_app.dart

@@ -1,6 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
@@ -10,6 +11,7 @@ import 'package:obtainium/pages/app.dart';
 import 'package:obtainium/pages/import_export.dart';
 import 'package:obtainium/pages/settings.dart';
 import 'package:obtainium/providers/apps_provider.dart';
+import 'package:obtainium/providers/notifications_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:provider/provider.dart';
@@ -28,24 +30,51 @@ class _AddAppPageState extends State<AddAppPage> {
 
   String userInput = '';
   String searchQuery = '';
+  String? pickedSourceOverride;
   AppSource? pickedSource;
   Map<String, dynamic> additionalSettings = {};
   bool additionalSettingsValid = true;
+  bool inferAppIdIfOptional = true;
   List<String> pickedCategories = [];
+  int searchnum = 0;
+  SourceProvider sourceProvider = SourceProvider();
 
   @override
   Widget build(BuildContext context) {
-    SourceProvider sourceProvider = SourceProvider();
     AppsProvider appsProvider = context.read<AppsProvider>();
+    SettingsProvider settingsProvider = context.watch<SettingsProvider>();
+    NotificationsProvider notificationsProvider =
+        context.read<NotificationsProvider>();
 
     bool doingSomething = gettingAppInfo || searching;
 
-    changeUserInput(String input, bool valid, bool isBuilding) {
+    changeUserInput(String input, bool valid, bool isBuilding,
+        {bool isSearch = false}) {
       userInput = input;
       if (!isBuilding) {
         setState(() {
-          var source = valid ? sourceProvider.getSource(userInput) : null;
-          if (pickedSource.runtimeType != source.runtimeType) {
+          if (isSearch) {
+            searchnum++;
+          }
+          var prevHost = pickedSource?.host;
+          try {
+            var naturalSource =
+                valid ? sourceProvider.getSource(userInput) : null;
+            if (naturalSource != null &&
+                naturalSource.runtimeType.toString() !=
+                    HTML().runtimeType.toString()) {
+              // If input has changed to match a regular source, reset the override
+              pickedSourceOverride = null;
+            }
+          } catch (e) {
+            // ignore
+          }
+          var source = valid
+              ? sourceProvider.getSource(userInput,
+                  overrideSource: pickedSourceOverride)
+              : null;
+          if (pickedSource.runtimeType != source.runtimeType ||
+              (prevHost != null && prevHost != source?.host)) {
             pickedSource = source;
             additionalSettings = source != null
                 ? getDefaultValuesFromFormItems(
@@ -54,338 +83,456 @@ class _AddAppPageState extends State<AddAppPage> {
             additionalSettingsValid = source != null
                 ? !sourceProvider.ifRequiredAppSpecificSettingsExist(source)
                 : true;
+            inferAppIdIfOptional = true;
           }
         });
       }
     }
 
+    Future<bool> getTrackOnlyConfirmationIfNeeded(bool userPickedTrackOnly,
+        {bool ignoreHideSetting = false}) async {
+      var useTrackOnly = userPickedTrackOnly || pickedSource!.enforceTrackOnly;
+      if (useTrackOnly &&
+          (!settingsProvider.hideTrackOnlyWarning || ignoreHideSetting)) {
+        // ignore: use_build_context_synchronously
+        var values = await showDialog(
+            context: context,
+            builder: (BuildContext ctx) {
+              return GeneratedFormModal(
+                initValid: true,
+                title: tr('xIsTrackOnly', args: [
+                  pickedSource!.enforceTrackOnly ? tr('source') : tr('app')
+                ]),
+                items: [
+                  [GeneratedFormSwitch('hide', label: tr('dontShowAgain'))]
+                ],
+                message:
+                    '${pickedSource!.enforceTrackOnly ? tr('appsFromSourceAreTrackOnly') : tr('youPickedTrackOnly')}\n\n${tr('trackOnlyAppDescription')}',
+              );
+            });
+        if (values != null) {
+          settingsProvider.hideTrackOnlyWarning = values['hide'] == true;
+        }
+        return useTrackOnly && values != null;
+      } else {
+        return true;
+      }
+    }
+
+    getReleaseDateAsVersionConfirmationIfNeeded(
+        bool userPickedTrackOnly) async {
+      return (!(additionalSettings['versionDetection'] ==
+              'releaseDateAsVersion' &&
+          // ignore: use_build_context_synchronously
+          await showDialog(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return GeneratedFormModal(
+                      title: tr('releaseDateAsVersion'),
+                      items: const [],
+                      message: tr('releaseDateAsVersionExplanation'),
+                    );
+                  }) ==
+              null));
+    }
+
     addApp({bool resetUserInputAfter = false}) async {
       setState(() {
         gettingAppInfo = true;
       });
-      var settingsProvider = context.read<SettingsProvider>();
-      () async {
+      try {
         var userPickedTrackOnly = additionalSettings['trackOnly'] == true;
-        var userPickedNoVersionDetection =
-            additionalSettings['noVersionDetection'] == true;
-        var cont = true;
-        if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
-            await showDialog(
-                    context: context,
-                    builder: (BuildContext ctx) {
-                      return GeneratedFormModal(
-                        title: tr('xIsTrackOnly', args: [
-                          pickedSource!.enforceTrackOnly
-                              ? tr('source')
-                              : tr('app')
-                        ]),
-                        items: const [],
-                        message:
-                            '${pickedSource!.enforceTrackOnly ? tr('appsFromSourceAreTrackOnly') : tr('youPickedTrackOnly')}\n\n${tr('trackOnlyAppDescription')}',
-                      );
-                    }) ==
-                null) {
-          cont = false;
-        }
-        if (userPickedNoVersionDetection &&
-            await showDialog(
-                    context: context,
-                    builder: (BuildContext ctx) {
-                      return GeneratedFormModal(
-                        title: tr('disableVersionDetection'),
-                        items: const [],
-                        message: tr('noVersionDetectionExplanation'),
-                      );
-                    }) ==
-                null) {
-          cont = false;
-        }
-        if (cont) {
-          HapticFeedback.selectionClick();
+        App? app;
+        if ((await getTrackOnlyConfirmationIfNeeded(userPickedTrackOnly)) &&
+            (await getReleaseDateAsVersionConfirmationIfNeeded(
+                userPickedTrackOnly))) {
           var trackOnly = pickedSource!.enforceTrackOnly || userPickedTrackOnly;
-          App app = await sourceProvider.getApp(
-              pickedSource!, userInput, additionalSettings,
+          app = await sourceProvider.getApp(
+              pickedSource!, userInput.trim(), additionalSettings,
               trackOnlyOverride: trackOnly,
-              noVersionDetectionOverride: userPickedNoVersionDetection);
-          if (!trackOnly) {
-            await settingsProvider.getInstallPermission();
-          }
+              overrideSource: pickedSourceOverride,
+              inferAppIdIfOptional: inferAppIdIfOptional);
           // Only download the APK here if you need to for the package ID
-          if (sourceProvider.isTempId(app.id) &&
-              app.additionalSettings['trackOnly'] != true) {
+          if (isTempId(app) && app.additionalSettings['trackOnly'] != true) {
             // ignore: use_build_context_synchronously
             var apkUrl = await appsProvider.confirmApkUrl(app, context);
             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);
-            app.id = downloadedApk.appId;
+            var downloadedArtifact = await appsProvider.downloadApp(
+                app, globalNavigatorKey.currentContext,
+                notificationsProvider: notificationsProvider);
+            DownloadedApk? downloadedFile;
+            DownloadedXApkDir? downloadedDir;
+            if (downloadedArtifact is DownloadedApk) {
+              downloadedFile = downloadedArtifact;
+            } else {
+              downloadedDir = downloadedArtifact as DownloadedXApkDir;
+            }
+            app.id = downloadedFile?.appId ?? downloadedDir!.appId;
           }
           if (appsProvider.apps.containsKey(app.id)) {
             throw ObtainiumError(tr('appAlreadyAdded'));
           }
-          if (app.additionalSettings['trackOnly'] == true) {
+          if (app.additionalSettings['trackOnly'] == true ||
+              app.additionalSettings['versionDetection'] !=
+                  'standardVersionDetection') {
             app.installedVersion = app.latestVersion;
           }
           app.categories = pickedCategories;
-          await appsProvider.saveApps([app]);
-
-          return app;
+          await appsProvider.saveApps([app], onlyIfExists: false);
         }
-      }()
-          .then((app) {
         if (app != null) {
-          Navigator.push(context,
-              MaterialPageRoute(builder: (context) => AppPage(appId: app.id)));
+          Navigator.push(globalNavigatorKey.currentContext ?? context,
+              MaterialPageRoute(builder: (context) => AppPage(appId: app!.id)));
         }
-      }).catchError((e) {
+      } catch (e) {
         showError(e, context);
-      }).whenComplete(() {
+      } finally {
         setState(() {
           gettingAppInfo = false;
           if (resetUserInputAfter) {
             changeUserInput('', false, true);
           }
         });
-      });
+      }
     }
 
+    Widget getUrlInputRow() => Row(
+          children: [
+            Expanded(
+                child: GeneratedForm(
+                    key: Key(searchnum.toString()),
+                    items: [
+                      [
+                        GeneratedFormTextField('appSourceURL',
+                            label: tr('appSourceURL'),
+                            defaultValue: userInput,
+                            additionalValidators: [
+                              (value) {
+                                try {
+                                  sourceProvider
+                                      .getSource(value ?? '',
+                                          overrideSource: pickedSourceOverride)
+                                      .standardizeUrl(value ?? '');
+                                } catch (e) {
+                                  return e is String
+                                      ? e
+                                      : e is ObtainiumError
+                                          ? e.toString()
+                                          : tr('error');
+                                }
+                                return null;
+                              }
+                            ])
+                      ]
+                    ],
+                    onValueChanges: (values, valid, isBuilding) {
+                      changeUserInput(
+                          values['appSourceURL']!, valid, isBuilding);
+                    })),
+            const SizedBox(
+              width: 16,
+            ),
+            gettingAppInfo
+                ? const CircularProgressIndicator()
+                : ElevatedButton(
+                    onPressed: doingSomething ||
+                            pickedSource == null ||
+                            (pickedSource!.combinedAppSpecificSettingFormItems
+                                    .isNotEmpty &&
+                                !additionalSettingsValid)
+                        ? null
+                        : () {
+                            HapticFeedback.selectionClick();
+                            addApp();
+                          },
+                    child: Text(tr('add')))
+          ],
+        );
+
+    runSearch() async {
+      setState(() {
+        searching = true;
+      });
+      try {
+        var results = await Future.wait(sourceProvider.sources
+            .where((e) => e.canSearch && !e.excludeFromMassSearch)
+            .map((e) async {
+          try {
+            return await e.search(searchQuery);
+          } catch (err) {
+            if (err is! CredsNeededError) {
+              rethrow;
+            } else {
+              return <String, List<String>>{};
+            }
+          }
+        }));
+
+        // .then((results) async {
+        // Interleave results instead of simple reduce
+        Map<String, List<String>> res = {};
+        var si = 0;
+        var done = false;
+        while (!done) {
+          done = true;
+          for (var r in results) {
+            if (r.length > si) {
+              done = false;
+              res.addEntries([r.entries.elementAt(si)]);
+            }
+          }
+          si++;
+        }
+        if (res.isEmpty) {
+          throw ObtainiumError(tr('noResults'));
+        }
+        List<String>? selectedUrls = res.isEmpty
+            ? []
+            // ignore: use_build_context_synchronously
+            : await showDialog<List<String>?>(
+                context: context,
+                builder: (BuildContext ctx) {
+                  return UrlSelectionModal(
+                    urlsWithDescriptions: res,
+                    selectedByDefault: false,
+                    onlyOneSelectionAllowed: true,
+                  );
+                });
+        if (selectedUrls != null && selectedUrls.isNotEmpty) {
+          changeUserInput(selectedUrls[0], true, false, isSearch: true);
+        }
+      } catch (e) {
+        showError(e, context);
+      } finally {
+        setState(() {
+          searching = false;
+        });
+      }
+    }
+
+    Widget getHTMLSourceOverrideDropdown() => Column(children: [
+          Row(
+            children: [
+              Expanded(
+                  child: GeneratedForm(
+                items: [
+                  [
+                    GeneratedFormDropdown(
+                        'overrideSource',
+                        defaultValue: HTML().runtimeType.toString(),
+                        [
+                          ...sourceProvider.sources.map(
+                              (s) => MapEntry(s.runtimeType.toString(), s.name))
+                        ],
+                        label: tr('overrideSource'))
+                  ]
+                ],
+                onValueChanges: (values, valid, isBuilding) {
+                  fn() {
+                    pickedSourceOverride = (values['overrideSource'] == null ||
+                            values['overrideSource'] == '')
+                        ? null
+                        : values['overrideSource'];
+                  }
+
+                  if (!isBuilding) {
+                    setState(() {
+                      fn();
+                    });
+                  } else {
+                    fn();
+                  }
+                  changeUserInput(userInput, valid, isBuilding);
+                },
+              ))
+            ],
+          ),
+          const SizedBox(
+            height: 16,
+          )
+        ]);
+
+    bool shouldShowSearchBar() =>
+        sourceProvider.sources.where((e) => e.canSearch).isNotEmpty &&
+        pickedSource == null &&
+        userInput.isEmpty;
+
+    Widget getSearchBarRow() => Row(
+          children: [
+            Expanded(
+              child: GeneratedForm(
+                  items: [
+                    [
+                      GeneratedFormTextField('searchSomeSources',
+                          label: tr('searchSomeSourcesLabel'), required: false),
+                    ]
+                  ],
+                  onValueChanges: (values, valid, isBuilding) {
+                    if (values.isNotEmpty && valid && !isBuilding) {
+                      setState(() {
+                        searchQuery = values['searchSomeSources']!.trim();
+                      });
+                    }
+                  }),
+            ),
+            const SizedBox(
+              width: 16,
+            ),
+            searching
+                ? const CircularProgressIndicator()
+                : ElevatedButton(
+                    onPressed: searchQuery.isEmpty || doingSomething
+                        ? null
+                        : () {
+                            runSearch();
+                          },
+                    child: Text(tr('search')))
+          ],
+        );
+
+    Widget getAdditionalOptsCol() => Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            const SizedBox(
+              height: 16,
+            ),
+            Text(
+                tr('additionalOptsFor',
+                    args: [pickedSource?.name ?? tr('source')]),
+                style: TextStyle(
+                    color: Theme.of(context).colorScheme.primary,
+                    fontWeight: FontWeight.bold)),
+            const SizedBox(
+              height: 16,
+            ),
+            GeneratedForm(
+                key: Key(pickedSource.runtimeType.toString()),
+                items: [
+                  ...pickedSource!.combinedAppSpecificSettingFormItems,
+                  ...(pickedSourceOverride != null
+                      ? pickedSource!.sourceConfigSettingFormItems
+                          .map((e) => [e])
+                      : [])
+                ],
+                onValueChanges: (values, valid, isBuilding) {
+                  if (!isBuilding) {
+                    setState(() {
+                      additionalSettings = values;
+                      additionalSettingsValid = valid;
+                    });
+                  }
+                }),
+            Column(
+              children: [
+                const SizedBox(
+                  height: 16,
+                ),
+                CategoryEditorSelector(
+                    alignment: WrapAlignment.start,
+                    onSelected: (categories) {
+                      pickedCategories = categories;
+                    }),
+              ],
+            ),
+            if (pickedSource != null && pickedSource!.appIdInferIsOptional)
+              GeneratedForm(
+                  key: const Key('inferAppIdIfOptional'),
+                  items: [
+                    [
+                      GeneratedFormSwitch('inferAppIdIfOptional',
+                          label: tr('tryInferAppIdFromCode'),
+                          defaultValue: inferAppIdIfOptional)
+                    ]
+                  ],
+                  onValueChanges: (values, valid, isBuilding) {
+                    if (!isBuilding) {
+                      setState(() {
+                        inferAppIdIfOptional = values['inferAppIdIfOptional'];
+                      });
+                    }
+                  }),
+          ],
+        );
+
+    Widget getSourcesListWidget() => Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text(
+                tr('supportedSources'),
+                style: const TextStyle(fontWeight: FontWeight.bold),
+              ),
+              const SizedBox(
+                height: 16,
+              ),
+              ...sourceProvider.sources
+                  .map((e) => GestureDetector(
+                      onTap: e.host != null
+                          ? () {
+                              launchUrlString('https://${e.host}',
+                                  mode: LaunchMode.externalApplication);
+                            }
+                          : null,
+                      child: Text(
+                        '${e.name}${e.enforceTrackOnly ? ' ${tr('trackOnlyInBrackets')}' : ''}${e.canSearch ? ' ${tr('searchableInBrackets')}' : ''}',
+                        style: TextStyle(
+                            decoration: e.host != null
+                                ? TextDecoration.underline
+                                : TextDecoration.none,
+                            fontStyle: FontStyle.italic),
+                      )))
+                  .toList()
+            ]);
+
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
-        body: CustomScrollView(slivers: <Widget>[
+        body: CustomScrollView(shrinkWrap: true, slivers: <Widget>[
           CustomAppBar(title: tr('addApp')),
-          SliverFillRemaining(
+          SliverToBoxAdapter(
             child: Padding(
                 padding: const EdgeInsets.all(16),
                 child: Column(
+                    mainAxisSize: MainAxisSize.min,
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      Row(
-                        children: [
-                          Expanded(
-                              child: GeneratedForm(
-                                  items: [
-                                [
-                                  GeneratedFormTextField('appSourceURL',
-                                      label: tr('appSourceURL'),
-                                      additionalValidators: [
-                                        (value) {
-                                          try {
-                                            sourceProvider
-                                                .getSource(value ?? '')
-                                                .standardizeURL(
-                                                    preStandardizeUrl(
-                                                        value ?? ''));
-                                          } catch (e) {
-                                            return e is String
-                                                ? e
-                                                : e is ObtainiumError
-                                                    ? e.toString()
-                                                    : tr('error');
-                                          }
-                                          return null;
-                                        }
-                                      ])
-                                ]
-                              ],
-                                  onValueChanges: (values, valid, isBuilding) {
-                                    changeUserInput(values['appSourceURL']!,
-                                        valid, isBuilding);
-                                  })),
-                          const SizedBox(
-                            width: 16,
-                          ),
-                          gettingAppInfo
-                              ? const CircularProgressIndicator()
-                              : ElevatedButton(
-                                  onPressed: doingSomething ||
-                                          pickedSource == null ||
-                                          (pickedSource!
-                                                  .combinedAppSpecificSettingFormItems
-                                                  .isNotEmpty &&
-                                              !additionalSettingsValid)
-                                      ? null
-                                      : addApp,
-                                  child: Text(tr('add')))
-                        ],
-                      ),
-                      if (sourceProvider.sources
-                              .where((e) => e.canSearch)
-                              .isNotEmpty &&
-                          pickedSource == null &&
-                          userInput.isEmpty)
-                        const SizedBox(
-                          height: 16,
-                        ),
-                      if (sourceProvider.sources
-                              .where((e) => e.canSearch)
-                              .isNotEmpty &&
-                          pickedSource == null &&
-                          userInput.isEmpty)
-                        Row(
-                          children: [
-                            Expanded(
-                              child: GeneratedForm(
-                                  items: [
-                                    [
-                                      GeneratedFormTextField(
-                                          'searchSomeSources',
-                                          label: tr('searchSomeSourcesLabel'),
-                                          required: false),
-                                    ]
-                                  ],
-                                  onValueChanges: (values, valid, isBuilding) {
-                                    if (values.isNotEmpty &&
-                                        valid &&
-                                        !isBuilding) {
-                                      setState(() {
-                                        searchQuery =
-                                            values['searchSomeSources']!.trim();
-                                      });
-                                    }
-                                  }),
-                            ),
-                            const SizedBox(
-                              width: 16,
-                            ),
-                            ElevatedButton(
-                                onPressed: searchQuery.isEmpty || doingSomething
-                                    ? null
-                                    : () {
-                                        setState(() {
-                                          searching = true;
-                                        });
-                                        Future.wait(sourceProvider.sources
-                                                .where((e) => e.canSearch)
-                                                .map((e) =>
-                                                    e.search(searchQuery)))
-                                            .then((results) async {
-                                          // Interleave results instead of simple reduce
-                                          Map<String, String> res = {};
-                                          var si = 0;
-                                          var done = false;
-                                          while (!done) {
-                                            done = true;
-                                            for (var r in results) {
-                                              if (r.length > si) {
-                                                done = false;
-                                                res.addEntries(
-                                                    [r.entries.elementAt(si)]);
-                                              }
-                                            }
-                                            si++;
-                                          }
-                                          List<String>? selectedUrls = res
-                                                  .isEmpty
-                                              ? []
-                                              : await showDialog<List<String>?>(
-                                                  context: context,
-                                                  builder: (BuildContext ctx) {
-                                                    return UrlSelectionModal(
-                                                      urlsWithDescriptions: res,
-                                                      selectedByDefault: false,
-                                                      onlyOneSelectionAllowed:
-                                                          true,
-                                                    );
-                                                  });
-                                          if (selectedUrls != null &&
-                                              selectedUrls.isNotEmpty) {
-                                            changeUserInput(
-                                                selectedUrls[0], true, false);
-                                            addApp(resetUserInputAfter: true);
-                                          }
-                                        }).catchError((e) {
-                                          showError(e, context);
-                                        }).whenComplete(() {
-                                          setState(() {
-                                            searching = false;
-                                          });
-                                        });
-                                      },
-                                child: Text(tr('search')))
-                          ],
-                        ),
-                      if (pickedSource != null)
-                        Column(
-                          crossAxisAlignment: CrossAxisAlignment.stretch,
-                          children: [
-                            const Divider(
-                              height: 64,
-                            ),
-                            Text(
-                                tr('additionalOptsFor',
-                                    args: [pickedSource?.name ?? tr('source')]),
-                                style: TextStyle(
-                                    color:
-                                        Theme.of(context).colorScheme.primary)),
-                            const SizedBox(
-                              height: 16,
-                            ),
-                            GeneratedForm(
-                                items: pickedSource!
-                                    .combinedAppSpecificSettingFormItems,
-                                onValueChanges: (values, valid, isBuilding) {
-                                  if (!isBuilding) {
-                                    setState(() {
-                                      additionalSettings = values;
-                                      additionalSettingsValid = valid;
-                                    });
-                                  }
-                                }),
-                            Column(
-                              children: [
-                                const SizedBox(
-                                  height: 16,
-                                ),
-                                CategoryEditorSelector(
-                                    alignment: WrapAlignment.start,
-                                    onSelected: (categories) {
-                                      pickedCategories = categories;
-                                    }),
-                              ],
-                            ),
-                          ],
-                        )
-                      else
-                        Expanded(
-                            child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.center,
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                              const SizedBox(
-                                height: 48,
-                              ),
-                              Text(
-                                tr('supportedSourcesBelow'),
-                              ),
-                              const SizedBox(
-                                height: 8,
-                              ),
-                              ...sourceProvider.sources
-                                  .map((e) => GestureDetector(
-                                      onTap: e.host != null
-                                          ? () {
-                                              launchUrlString(
-                                                  'https://${e.host}',
-                                                  mode: LaunchMode
-                                                      .externalApplication);
-                                            }
-                                          : null,
-                                      child: Text(
-                                        '${e.name}${e.enforceTrackOnly ? ' ${tr('trackOnlyInBrackets')}' : ''}${e.canSearch ? ' ${tr('searchableInBrackets')}' : ''}',
-                                        style: TextStyle(
-                                            decoration: e.host != null
-                                                ? TextDecoration.underline
-                                                : TextDecoration.none,
-                                            fontStyle: FontStyle.italic),
-                                      )))
-                                  .toList()
-                            ])),
+                      getUrlInputRow(),
                       const SizedBox(
-                        height: 8,
+                        height: 16,
+                      ),
+                      if (pickedSourceOverride != null ||
+                          (pickedSource != null &&
+                              pickedSource.runtimeType.toString() ==
+                                  HTML().runtimeType.toString()))
+                        getHTMLSourceOverrideDropdown(),
+                      if (shouldShowSearchBar()) getSearchBarRow(),
+                      if (pickedSource != null)
+                        FutureBuilder(
+                            builder: (ctx, val) {
+                              return val.data != null && val.data!.isNotEmpty
+                                  ? Text(
+                                      val.data!,
+                                      style:
+                                          Theme.of(context).textTheme.bodySmall,
+                                    )
+                                  : const SizedBox();
+                            },
+                            future: pickedSource?.getSourceNote()),
+                      SizedBox(
+                        height: pickedSource != null ? 16 : 96,
+                      ),
+                      if (pickedSource != null) getAdditionalOptsCol(),
+                      if (pickedSource == null)
+                        const Divider(
+                          height: 48,
+                        ),
+                      if (pickedSource == null) getSourcesListWidget(),
+                      SizedBox(
+                        height: pickedSource != null ? 8 : 2,
                       ),
                     ])),
           )

lib/pages/app.dart

@@ -1,6 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
@@ -31,385 +32,467 @@ class _AppPageState extends State<AppPage> {
     getUpdate(String id) {
       appsProvider.checkUpdate(id).catchError((e) {
         showError(e, context);
+        return null;
       });
     }
 
+    bool areDownloadsRunning = appsProvider.areDownloadsRunning();
+
     var sourceProvider = SourceProvider();
-    AppInMemory? app = appsProvider.apps[widget.appId];
-    var source = app != null ? sourceProvider.getSource(app.app.url) : null;
-    if (!appsProvider.areDownloadsRunning() && prevApp == null && app != null) {
+    AppInMemory? app = appsProvider.apps[widget.appId]?.deepCopy();
+    var source = app != null
+        ? sourceProvider.getSource(app.app.url,
+            overrideSource: app.app.overrideSource)
+        : null;
+    if (!areDownloadsRunning &&
+        prevApp == null &&
+        app != null &&
+        settingsProvider.checkUpdateOnDetailPage) {
       prevApp = app;
       getUpdate(app.app.id);
     }
     var trackOnly = app?.app.additionalSettings['trackOnly'] == true;
 
-    var infoColumn = Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: [
-        GestureDetector(
-            onTap: () {
-              if (app?.app.url != null) {
-                launchUrlString(app?.app.url ?? '',
-                    mode: LaunchMode.externalApplication);
-              }
-            },
-            child: Text(
-              app?.app.url ?? '',
-              textAlign: TextAlign.center,
-              style: const TextStyle(
-                  decoration: TextDecoration.underline,
-                  fontStyle: FontStyle.italic,
-                  fontSize: 12),
-            )),
-        const SizedBox(
-          height: 32,
-        ),
-        Text(
-          tr('latestVersionX', args: [app?.app.latestVersion ?? tr('unknown')]),
-          textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.bodyLarge,
-        ),
-        Text(
-          '${tr('installedVersionX', args: [
-                app?.app.installedVersion ?? tr('none')
-              ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
-                  tr('app')
-                ])}' : ''}',
-          textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.bodyLarge,
-        ),
-        const SizedBox(
-          height: 32,
-        ),
-        Text(
-          tr('lastUpdateCheckX', args: [
-            app?.app.lastUpdateCheck == null
-                ? tr('never')
-                : '\n${app?.app.lastUpdateCheck?.toLocal()}'
-          ]),
-          textAlign: TextAlign.center,
-          style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
-        ),
-        const SizedBox(
-          height: 48,
-        ),
-        CategoryEditorSelector(
-            alignment: WrapAlignment.center,
-            preselected:
-                app?.app.categories != null ? app!.app.categories.toSet() : {},
-            onSelected: (categories) {
-              if (app != null) {
-                app.app.categories = categories;
-                appsProvider.saveApps([app.app]);
-              }
-            }),
-      ],
-    );
+    bool isVersionDetectionStandard =
+        app?.app.additionalSettings['versionDetection'] ==
+            'standardVersionDetection';
 
-    var fullInfoColumn = Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: [
-        const SizedBox(height: 150),
-        app?.installedInfo != null
-            ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [
-                Image.memory(
-                  app!.installedInfo!.icon!,
-                  height: 150,
-                  gaplessPlayback: true,
-                )
-              ])
-            : Container(),
-        const SizedBox(
-          height: 25,
-        ),
-        Text(
-          app?.installedInfo?.name ?? app?.app.name ?? tr('app'),
+    bool installedVersionIsEstimate = trackOnly ||
+        (app?.app.installedVersion != null &&
+            app?.app.additionalSettings['versionDetection'] ==
+                'noVersionDetection');
+
+    getInfoColumn() => Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            GestureDetector(
+                onTap: () {
+                  if (app?.app.url != null) {
+                    launchUrlString(app?.app.url ?? '',
+                        mode: LaunchMode.externalApplication);
+                  }
+                },
+                onLongPress: () {
+                  Clipboard.setData(ClipboardData(text: app?.app.url ?? ''));
+                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                    content: Text(tr('copiedToClipboard')),
+                  ));
+                },
+                child: Text(
+                  app?.app.url ?? '',
+                  textAlign: TextAlign.center,
+                  style: const TextStyle(
+                      decoration: TextDecoration.underline,
+                      fontStyle: FontStyle.italic,
+                      fontSize: 12),
+                )),
+            const SizedBox(
+              height: 32,
+            ),
+            Column(
+              children: [
+                Text(
+                  '${tr('latestVersionX', args: [
+                        app?.app.latestVersion ?? tr('unknown')
+                      ])}\n${tr('installedVersionX', args: [
+                        app?.app.installedVersion ?? tr('none')
+                      ])}${installedVersionIsEstimate ? '\n${tr('estimateInBrackets')}' : ''}',
+                  textAlign: TextAlign.end,
+                  style: Theme.of(context).textTheme.bodyLarge!,
+                ),
+              ],
+            ),
+            if (app?.app.installedVersion != null &&
+                !isVersionDetectionStandard)
+              Column(
+                children: [
+                  const SizedBox(
+                    height: 16,
+                  ),
+                  Text(
+                    '${trackOnly ? '${tr('xIsTrackOnly', args: [
+                            tr('app')
+                          ])}\n' : ''}${tr('noVersionDetection')}',
+                    style: Theme.of(context).textTheme.labelSmall,
+                    textAlign: TextAlign.center,
+                  )
+                ],
+              ),
+            const SizedBox(
+              height: 32,
+            ),
+            Text(
+              tr('lastUpdateCheckX', args: [
+                app?.app.lastUpdateCheck == null
+                    ? tr('never')
+                    : '\n${app?.app.lastUpdateCheck?.toLocal()}'
+              ]),
+              textAlign: TextAlign.center,
+              style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
+            ),
+            const SizedBox(
+              height: 48,
+            ),
+            CategoryEditorSelector(
+                alignment: WrapAlignment.center,
+                preselected: app?.app.categories != null
+                    ? app!.app.categories.toSet()
+                    : {},
+                onSelected: (categories) {
+                  if (app != null) {
+                    app.app.categories = categories;
+                    appsProvider.saveApps([app.app]);
+                  }
+                }),
+          ],
+        );
+
+    getFullInfoColumn() => Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            const SizedBox(height: 20),
+            app?.icon != null
+                ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+                    GestureDetector(
+                      child: Image.memory(
+                        app!.icon!,
+                        height: 150,
+                        gaplessPlayback: true,
+                      ),
+                      onTap: () => pm.openApp(app.app.id),
+                    )
+                  ])
+                : Container(),
+            const SizedBox(
+              height: 25,
+            ),
+            Text(
+              app?.name ?? tr('app'),
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.displayLarge,
+            ),
+            Text(
+              tr('byX', args: [app?.app.author ?? tr('unknown')]),
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.headlineMedium,
+            ),
+            const SizedBox(
+              height: 8,
+            ),
+            Text(
+              app?.app.id ?? '',
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.labelSmall,
+            ),
+            app?.app.releaseDate == null
+                ? const SizedBox.shrink()
+                : Text(
+                    app!.app.releaseDate.toString(),
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.labelSmall,
+                  ),
+            const SizedBox(
+              height: 32,
+            ),
+            getInfoColumn(),
+            const SizedBox(height: 150)
+          ],
+        );
+
+    getAppWebView() => app != null
+        ? WebViewWidget(
+            controller: WebViewController()
+              ..setJavaScriptMode(JavaScriptMode.unrestricted)
+              ..setBackgroundColor(Theme.of(context).colorScheme.background)
+              ..setJavaScriptMode(JavaScriptMode.unrestricted)
+              ..setNavigationDelegate(
+                NavigationDelegate(
+                  onWebResourceError: (WebResourceError error) {
+                    if (error.isForMainFrame == true) {
+                      showError(
+                          ObtainiumError(error.description, unexpected: true),
+                          context);
+                    }
+                  },
+                ),
+              )
+              ..loadRequest(Uri.parse(app.app.url)))
+        : Container();
+
+    showMarkUpdatedDialog() {
+      return showDialog(
+          context: context,
+          builder: (BuildContext ctx) {
+            return AlertDialog(
+              title: Text(tr('alreadyUpToDateQuestion')),
+              actions: [
+                TextButton(
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                    },
+                    child: Text(tr('no'))),
+                TextButton(
+                    onPressed: () {
+                      HapticFeedback.selectionClick();
+                      var updatedApp = app?.app;
+                      if (updatedApp != null) {
+                        updatedApp.installedVersion = updatedApp.latestVersion;
+                        appsProvider.saveApps([updatedApp]);
+                      }
+                      Navigator.of(context).pop();
+                    },
+                    child: Text(tr('yesMarkUpdated')))
+              ],
+            );
+          });
+    }
+
+    showAdditionalOptionsDialog() async {
+      return await showDialog<Map<String, dynamic>?>(
+          context: context,
+          builder: (BuildContext ctx) {
+            var items =
+                (source?.combinedAppSpecificSettingFormItems ?? []).map((row) {
+              row = row.map((e) {
+                if (app?.app.additionalSettings[e.key] != null) {
+                  e.defaultValue = app?.app.additionalSettings[e.key];
+                }
+                return e;
+              }).toList();
+              return row;
+            }).toList();
+
+            items = items.map((row) {
+              row = row.map((e) {
+                if (e.key == 'versionDetection' && e is GeneratedFormDropdown) {
+                  e.disabledOptKeys ??= [];
+                  if (app?.app.installedVersion != null &&
+                      app?.app.additionalSettings['versionDetection'] !=
+                          'releaseDateAsVersion' &&
+                      !appsProvider.isVersionDetectionPossible(app)) {
+                    e.disabledOptKeys!.add('standardVersionDetection');
+                  }
+                  if (app?.app.releaseDate == null) {
+                    e.disabledOptKeys!.add('releaseDateAsVersion');
+                  }
+                }
+                return e;
+              }).toList();
+              return row;
+            }).toList();
+
+            return GeneratedFormModal(
+                title: tr('additionalOptions'), items: items);
+          });
+    }
+
+    handleAdditionalOptionChanges(Map<String, dynamic>? values) {
+      if (app != null && values != null) {
+        Map<String, dynamic> originalSettings = app.app.additionalSettings;
+        app.app.additionalSettings = values;
+        if (source?.enforceTrackOnly == true) {
+          app.app.additionalSettings['trackOnly'] = true;
+          // ignore: use_build_context_synchronously
+          showMessage(tr('appsFromSourceAreTrackOnly'), context);
+        }
+        if (app.app.additionalSettings['versionDetection'] ==
+            'releaseDateAsVersion') {
+          if (originalSettings['versionDetection'] != 'releaseDateAsVersion') {
+            if (app.app.releaseDate != null) {
+              bool isUpdated =
+                  app.app.installedVersion == app.app.latestVersion;
+              app.app.latestVersion =
+                  app.app.releaseDate!.microsecondsSinceEpoch.toString();
+              if (isUpdated) {
+                app.app.installedVersion = app.app.latestVersion;
+              }
+            }
+          }
+        } else if (originalSettings['versionDetection'] ==
+            'releaseDateAsVersion') {
+          app.app.installedVersion =
+              app.installedInfo?.versionName ?? app.app.installedVersion;
+        }
+        appsProvider.saveApps([app.app]).then((value) {
+          getUpdate(app.app.id);
+        });
+      }
+    }
+
+    getResetInstallStatusButton() => TextButton(
+        onPressed: app?.app == null
+            ? null
+            : () {
+                app!.app.installedVersion = null;
+                appsProvider.saveApps([app.app]);
+              },
+        child: Text(
+          tr('resetInstallStatus'),
           textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.displayLarge,
-        ),
-        Text(
-          tr('byX', args: [app?.app.author ?? tr('unknown')]),
-          textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.headlineMedium,
-        ),
-        const SizedBox(
-          height: 32,
-        ),
-        infoColumn,
-        const SizedBox(height: 150)
-      ],
-    );
+        ));
+
+    getInstallOrUpdateButton() => TextButton(
+        onPressed: (app?.app.installedVersion == null ||
+                    app?.app.installedVersion != app?.app.latestVersion) &&
+                !areDownloadsRunning
+            ? () async {
+                try {
+                  HapticFeedback.heavyImpact();
+                  var res = await appsProvider.downloadAndInstallLatestApps(
+                    app?.app.id != null ? [app!.app.id] : [],
+                    globalNavigatorKey.currentContext,
+                  );
+                  if (app?.app.installedVersion != null && !trackOnly) {
+                    // ignore: use_build_context_synchronously
+                    showMessage(tr('appsUpdated'), context);
+                  }
+                  if (res.isNotEmpty && mounted) {
+                    Navigator.of(context).pop();
+                  }
+                } catch (e) {
+                  // ignore: use_build_context_synchronously
+                  showError(e, context);
+                }
+              }
+            : null,
+        child: Text(app?.app.installedVersion == null
+            ? !trackOnly
+                ? tr('install')
+                : tr('markInstalled')
+            : !trackOnly
+                ? tr('update')
+                : tr('markUpdated')));
+
+    getBottomSheetMenu() => Padding(
+        padding:
+            EdgeInsets.fromLTRB(0, 0, 0, MediaQuery.of(context).padding.bottom),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Padding(
+                padding: const EdgeInsets.fromLTRB(16, 8, 16, 0),
+                child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                    children: [
+                      if (app?.app.installedVersion != null &&
+                          app?.app.installedVersion != app?.app.latestVersion &&
+                          !isVersionDetectionStandard &&
+                          !trackOnly)
+                        IconButton(
+                            onPressed: app?.downloadProgress != null
+                                ? null
+                                : showMarkUpdatedDialog,
+                            tooltip: tr('markUpdated'),
+                            icon: const Icon(Icons.done)),
+                      if (source != null &&
+                          source.combinedAppSpecificSettingFormItems.isNotEmpty)
+                        IconButton(
+                            onPressed: app?.downloadProgress != null
+                                ? null
+                                : () async {
+                                    var values =
+                                        await showAdditionalOptionsDialog();
+                                    handleAdditionalOptionChanges(values);
+                                  },
+                            tooltip: tr('additionalOptions'),
+                            icon: const Icon(Icons.edit)),
+                      if (app != null && app.installedInfo != null)
+                        IconButton(
+                          onPressed: () {
+                            appsProvider.openAppSettings(app.app.id);
+                          },
+                          icon: const Icon(Icons.settings),
+                          tooltip: tr('settings'),
+                        ),
+                      if (app != null && settingsProvider.showAppWebpage)
+                        IconButton(
+                            onPressed: () {
+                              showDialog(
+                                  context: context,
+                                  builder: (BuildContext ctx) {
+                                    return AlertDialog(
+                                      scrollable: true,
+                                      content: getInfoColumn(),
+                                      title: Text(
+                                          '${app.name} ${tr('byX', args: [
+                                            app.app.author
+                                          ])}'),
+                                      actions: [
+                                        TextButton(
+                                            onPressed: () {
+                                              Navigator.of(context).pop();
+                                            },
+                                            child: Text(tr('continue')))
+                                      ],
+                                    );
+                                  });
+                            },
+                            icon: const Icon(Icons.more_horiz),
+                            tooltip: tr('more')),
+                      const SizedBox(width: 16.0),
+                      Expanded(
+                          child: (!isVersionDetectionStandard || trackOnly) &&
+                                  app?.app.installedVersion != null &&
+                                  app?.app.installedVersion ==
+                                      app?.app.latestVersion
+                              ? getResetInstallStatusButton()
+                              : getInstallOrUpdateButton()),
+                      const SizedBox(width: 16.0),
+                      IconButton(
+                        onPressed: app?.downloadProgress != null
+                            ? null
+                            : () {
+                                appsProvider
+                                    .removeAppsWithModal(
+                                        context, app != null ? [app.app] : [])
+                                    .then((value) {
+                                  if (value == true) {
+                                    Navigator.of(context).pop();
+                                  }
+                                });
+                              },
+                        tooltip: tr('remove'),
+                        icon: const Icon(Icons.delete_outline),
+                      ),
+                    ])),
+            if (app?.downloadProgress != null)
+              Padding(
+                  padding: const EdgeInsets.fromLTRB(0, 8, 0, 0),
+                  child: LinearProgressIndicator(
+                      value: app!.downloadProgress! >= 0
+                          ? app.downloadProgress! / 100
+                          : null))
+          ],
+        ));
+
+    appScreenAppBar() => AppBar(
+          leading: IconButton(
+            icon: const Icon(Icons.arrow_back),
+            onPressed: () {
+              Navigator.pop(context);
+            },
+          ),
+        );
 
     return Scaffold(
-      appBar: settingsProvider.showAppWebpage ? AppBar() : null,
-      backgroundColor: Theme.of(context).colorScheme.surface,
-      body: RefreshIndicator(
-          child: settingsProvider.showAppWebpage
-              ? app != null
-                  ? WebViewWidget(
-                      controller: WebViewController()
-                        ..setJavaScriptMode(JavaScriptMode.unrestricted)
-                        ..setBackgroundColor(
-                            Theme.of(context).colorScheme.background)
-                        ..setJavaScriptMode(JavaScriptMode.unrestricted)
-                        ..setNavigationDelegate(
-                          NavigationDelegate(
-                            onWebResourceError: (WebResourceError error) {
-                              if (error.isForMainFrame == true) {
-                                showError(
-                                    ObtainiumError(error.description,
-                                        unexpected: true),
-                                    context);
-                              }
-                            },
-                          ),
-                        )
-                        ..loadRequest(Uri.parse(app.app.url)))
-                  : Container()
-              : CustomScrollView(
-                  slivers: [
-                    SliverToBoxAdapter(
-                        child: Column(children: [fullInfoColumn])),
-                  ],
-                ),
-          onRefresh: () async {
-            if (app != null) {
-              getUpdate(app.app.id);
-            }
-          }),
-      bottomSheet: Padding(
-          padding: EdgeInsets.fromLTRB(
-              0, 0, 0, MediaQuery.of(context).padding.bottom),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Padding(
-                  padding: const EdgeInsets.fromLTRB(16, 8, 16, 0),
-                  child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                      children: [
-                        if (app?.app.installedVersion != null &&
-                            !trackOnly &&
-                            app?.app.installedVersion != app?.app.latestVersion)
-                          IconButton(
-                              onPressed: app?.downloadProgress != null
-                                  ? null
-                                  : () {
-                                      showDialog(
-                                          context: context,
-                                          builder: (BuildContext ctx) {
-                                            return AlertDialog(
-                                              title: Text(tr(
-                                                  'alreadyUpToDateQuestion')),
-                                              content: Text(
-                                                  tr('onlyWorksWithNonEVDApps'),
-                                                  style: const TextStyle(
-                                                      fontWeight:
-                                                          FontWeight.bold,
-                                                      fontStyle:
-                                                          FontStyle.italic)),
-                                              actions: [
-                                                TextButton(
-                                                    onPressed: () {
-                                                      Navigator.of(context)
-                                                          .pop();
-                                                    },
-                                                    child: Text(tr('no'))),
-                                                TextButton(
-                                                    onPressed: () {
-                                                      HapticFeedback
-                                                          .selectionClick();
-                                                      var updatedApp = app?.app;
-                                                      if (updatedApp != null) {
-                                                        updatedApp
-                                                                .installedVersion =
-                                                            updatedApp
-                                                                .latestVersion;
-                                                        appsProvider.saveApps(
-                                                            [updatedApp]);
-                                                      }
-                                                      Navigator.of(context)
-                                                          .pop();
-                                                    },
-                                                    child: Text(
-                                                        tr('yesMarkUpdated')))
-                                              ],
-                                            );
-                                          });
-                                    },
-                              tooltip: tr('markUpdated'),
-                              icon: const Icon(Icons.done)),
-                        if (source != null &&
-                            source
-                                .combinedAppSpecificSettingFormItems.isNotEmpty)
-                          IconButton(
-                              onPressed: app?.downloadProgress != null
-                                  ? null
-                                  : () {
-                                      showDialog<Map<String, dynamic>?>(
-                                          context: context,
-                                          builder: (BuildContext ctx) {
-                                            var items = source
-                                                .combinedAppSpecificSettingFormItems
-                                                .map((row) {
-                                              row.map((e) {
-                                                if (app?.app.additionalSettings[
-                                                        e.key] !=
-                                                    null) {
-                                                  e.defaultValue = app?.app
-                                                          .additionalSettings[
-                                                      e.key];
-                                                }
-                                                return e;
-                                              }).toList();
-                                              return row;
-                                            }).toList();
-                                            return GeneratedFormModal(
-                                                title: tr('additionalOptions'),
-                                                items: items);
-                                          }).then((values) {
-                                        if (app != null && values != null) {
-                                          var changedApp = app.app;
-                                          changedApp.additionalSettings =
-                                              values;
-                                          if (source.enforceTrackOnly) {
-                                            changedApp.additionalSettings[
-                                                'trackOnly'] = true;
-                                            showError(
-                                                tr('appsFromSourceAreTrackOnly'),
-                                                context);
-                                          }
-                                          appsProvider.saveApps(
-                                              [changedApp]).then((value) {
-                                            getUpdate(changedApp.id);
-                                          });
-                                        }
-                                      });
-                                    },
-                              tooltip: tr('additionalOptions'),
-                              icon: const Icon(Icons.settings)),
-                        if (app != null && settingsProvider.showAppWebpage)
-                          IconButton(
-                              onPressed: () {
-                                showDialog(
-                                    context: context,
-                                    builder: (BuildContext ctx) {
-                                      return AlertDialog(
-                                        scrollable: true,
-                                        content: infoColumn,
-                                        title: Text(
-                                            '${app.app.name} ${tr('byX', args: [
-                                              app.app.author
-                                            ])}'),
-                                        actions: [
-                                          TextButton(
-                                              onPressed: () {
-                                                Navigator.of(context).pop();
-                                              },
-                                              child: Text(tr('continue')))
-                                        ],
-                                      );
-                                    });
-                              },
-                              icon: const Icon(Icons.more_horiz),
-                              tooltip: tr('more')),
-                        const SizedBox(width: 16.0),
-                        Expanded(
-                            child: ElevatedButton(
-                                onPressed: (app?.app.installedVersion == null ||
-                                            app?.app.installedVersion !=
-                                                app?.app.latestVersion) &&
-                                        !appsProvider.areDownloadsRunning()
-                                    ? () {
-                                        HapticFeedback.heavyImpact();
-                                        () async {
-                                          if (app?.app.additionalSettings[
-                                                  'trackOnly'] !=
-                                              true) {
-                                            await settingsProvider
-                                                .getInstallPermission();
-                                          }
-                                        }()
-                                            .then((value) {
-                                          appsProvider
-                                              .downloadAndInstallLatestApps(
-                                                  [app!.app.id],
-                                                  globalNavigatorKey
-                                                      .currentContext).then(
-                                                  (res) {
-                                            if (res.isNotEmpty && mounted) {
-                                              Navigator.of(context).pop();
-                                            }
-                                          });
-                                        }).catchError((e) {
-                                          showError(e, context);
-                                        });
-                                      }
-                                    : null,
-                                child: Text(app?.app.installedVersion == null
-                                    ? !trackOnly
-                                        ? tr('install')
-                                        : tr('markInstalled')
-                                    : !trackOnly
-                                        ? tr('update')
-                                        : tr('markUpdated')))),
-                        const SizedBox(width: 16.0),
-                        ElevatedButton(
-                          onPressed: app?.downloadProgress != null
-                              ? null
-                              : () {
-                                  showDialog(
-                                      context: context,
-                                      builder: (BuildContext ctx) {
-                                        return AlertDialog(
-                                          title: Text(tr('removeAppQuestion')),
-                                          content: Text(tr(
-                                              'xWillBeRemovedButRemainInstalled',
-                                              args: [
-                                                app?.installedInfo?.name ??
-                                                    app?.app.name ??
-                                                    tr('app')
-                                              ])),
-                                          actions: [
-                                            TextButton(
-                                                onPressed: () {
-                                                  HapticFeedback
-                                                      .selectionClick();
-                                                  appsProvider.removeApps(
-                                                      [app!.app.id]).then((_) {
-                                                    int count = 0;
-                                                    Navigator.of(context)
-                                                        .popUntil((_) =>
-                                                            count++ >= 2);
-                                                  });
-                                                },
-                                                child: Text(tr('remove'))),
-                                            TextButton(
-                                                onPressed: () {
-                                                  Navigator.of(context).pop();
-                                                },
-                                                child: Text(tr('cancel')))
-                                          ],
-                                        );
-                                      });
-                                },
-                          style: TextButton.styleFrom(
-                              foregroundColor:
-                                  Theme.of(context).colorScheme.error,
-                              surfaceTintColor:
-                                  Theme.of(context).colorScheme.error),
-                          child: Text(tr('remove')),
-                        ),
-                      ])),
-              if (app?.downloadProgress != null)
-                Padding(
-                    padding: const EdgeInsets.fromLTRB(0, 8, 0, 0),
-                    child: LinearProgressIndicator(
-                        value: app!.downloadProgress! / 100))
-            ],
-          )),
-    );
+        appBar: settingsProvider.showAppWebpage ? AppBar() : appScreenAppBar(),
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        body: RefreshIndicator(
+            child: settingsProvider.showAppWebpage
+                ? getAppWebView()
+                : CustomScrollView(
+                    slivers: [
+                      SliverToBoxAdapter(
+                          child: Column(children: [getFullInfoColumn()])),
+                    ],
+                  ),
+            onRefresh: () async {
+              if (app != null) {
+                getUpdate(app.app.id);
+              }
+            }),
+        bottomSheet: getBottomSheetMenu());
   }
 }

lib/pages/home.dart

@@ -6,6 +6,9 @@ import 'package:obtainium/pages/add_app.dart';
 import 'package:obtainium/pages/apps.dart';
 import 'package:obtainium/pages/import_export.dart';
 import 'package:obtainium/pages/settings.dart';
+import 'package:obtainium/providers/apps_provider.dart';
+import 'package:obtainium/providers/settings_provider.dart';
+import 'package:provider/provider.dart';
 
 class HomePage extends StatefulWidget {
   const HomePage({super.key});
@@ -24,6 +27,9 @@ class NavigationPageItem {
 
 class _HomePageState extends State<HomePage> {
   List<int> selectedIndexHistory = [];
+  bool isReversing = false;
+  int prevAppCount = -1;
+  bool prevIsLoading = true;
 
   List<NavigationPageItem> pages = [
     NavigationPageItem(tr('appsString'), Icons.apps,
@@ -36,10 +42,61 @@ class _HomePageState extends State<HomePage> {
 
   @override
   Widget build(BuildContext context) {
+    AppsProvider appsProvider = context.watch<AppsProvider>();
+    SettingsProvider settingsProvider = context.watch<SettingsProvider>();
+
+    setIsReversing(int targetIndex) {
+      bool reversing = selectedIndexHistory.isNotEmpty &&
+          selectedIndexHistory.last > targetIndex;
+      setState(() {
+        isReversing = reversing;
+      });
+    }
+
+    switchToPage(int index) async {
+      setIsReversing(index);
+      if (index == 0) {
+        while ((pages[0].widget.key as GlobalKey<AppsPageState>).currentState !=
+            null) {
+          // Avoid duplicate GlobalKey error
+          await Future.delayed(const Duration(microseconds: 1));
+        }
+        setState(() {
+          selectedIndexHistory.clear();
+        });
+      } else if (selectedIndexHistory.isEmpty ||
+          (selectedIndexHistory.isNotEmpty &&
+              selectedIndexHistory.last != index)) {
+        setState(() {
+          int existingInd = selectedIndexHistory.indexOf(index);
+          if (existingInd >= 0) {
+            selectedIndexHistory.removeAt(existingInd);
+          }
+          selectedIndexHistory.add(index);
+        });
+      }
+    }
+
+    if (!prevIsLoading &&
+        prevAppCount >= 0 &&
+        appsProvider.apps.length > prevAppCount &&
+        selectedIndexHistory.isNotEmpty &&
+        selectedIndexHistory.last == 1) {
+      switchToPage(0);
+    }
+    prevAppCount = appsProvider.apps.length;
+    prevIsLoading = appsProvider.loadingApps;
+
     return WillPopScope(
         child: Scaffold(
           backgroundColor: Theme.of(context).colorScheme.surface,
           body: PageTransitionSwitcher(
+            duration: Duration(
+                milliseconds:
+                    settingsProvider.disablePageTransitions ? 0 : 300),
+            reverse: settingsProvider.reversePageTransitions
+                ? !isReversing
+                : isReversing,
             transitionBuilder: (
               Widget child,
               Animation<double> animation,
@@ -63,27 +120,18 @@ class _HomePageState extends State<HomePage> {
                 .map((e) =>
                     NavigationDestination(icon: Icon(e.icon), label: e.title))
                 .toList(),
-            onDestinationSelected: (int index) {
+            onDestinationSelected: (int index) async {
               HapticFeedback.selectionClick();
-              setState(() {
-                if (index == 0) {
-                  selectedIndexHistory.clear();
-                } else if (selectedIndexHistory.isEmpty ||
-                    (selectedIndexHistory.isNotEmpty &&
-                        selectedIndexHistory.last != index)) {
-                  int existingInd = selectedIndexHistory.indexOf(index);
-                  if (existingInd >= 0) {
-                    selectedIndexHistory.removeAt(existingInd);
-                  }
-                  selectedIndexHistory.add(index);
-                }
-              });
+              switchToPage(index);
             },
             selectedIndex:
                 selectedIndexHistory.isEmpty ? 0 : selectedIndexHistory.last,
           ),
         ),
         onWillPop: () async {
+          setIsReversing(selectedIndexHistory.length >= 2
+              ? selectedIndexHistory.reversed.toList()[1]
+              : 0);
           if (selectedIndexHistory.isNotEmpty) {
             setState(() {
               selectedIndexHistory.removeLast();

lib/pages/import_export.dart

@@ -28,8 +28,9 @@ class _ImportExportPageState extends State<ImportExportPage> {
   @override
   Widget build(BuildContext context) {
     SourceProvider sourceProvider = SourceProvider();
-    var appsProvider = context.read<AppsProvider>();
-    var settingsProvider = context.read<SettingsProvider>();
+    var appsProvider = context.watch<AppsProvider>();
+    var settingsProvider = context.watch<SettingsProvider>();
+
     var outlineButtonStyle = ButtonStyle(
       shape: MaterialStateProperty.all(
         StadiumBorder(
@@ -41,6 +42,263 @@ class _ImportExportPageState extends State<ImportExportPage> {
       ),
     );
 
+    urlListImport({String? initValue, bool overrideInitValid = false}) {
+      showDialog<Map<String, dynamic>?>(
+          context: context,
+          builder: (BuildContext ctx) {
+            return GeneratedFormModal(
+              initValid: overrideInitValid,
+              title: tr('importFromURLList'),
+              items: [
+                [
+                  GeneratedFormTextField('appURLList',
+                      defaultValue: initValue ?? '',
+                      label: tr('appURLList'),
+                      max: 7,
+                      additionalValidators: [
+                        (dynamic value) {
+                          if (value != null && value.isNotEmpty) {
+                            var lines = value.trim().split('\n');
+                            for (int i = 0; i < lines.length; i++) {
+                              try {
+                                sourceProvider.getSource(lines[i]);
+                              } catch (e) {
+                                return '${tr('line')} ${i + 1}: $e';
+                              }
+                            }
+                          }
+                          return null;
+                        }
+                      ])
+                ]
+              ],
+            );
+          }).then((values) {
+        if (values != null) {
+          var urls = (values['appURLList'] as String).split('\n');
+          setState(() {
+            importInProgress = true;
+          });
+          appsProvider.addAppsByURL(urls).then((errors) {
+            if (errors.isEmpty) {
+              showMessage(tr('importedX', args: [plural('apps', urls.length)]),
+                  context);
+            } else {
+              showDialog(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return ImportErrorDialog(
+                        urlsLength: urls.length, errors: errors);
+                  });
+            }
+          }).catchError((e) {
+            showError(e, context);
+          }).whenComplete(() {
+            setState(() {
+              importInProgress = false;
+            });
+          });
+        }
+      });
+    }
+
+    runObtainiumExport({bool pickOnly = false}) async {
+      HapticFeedback.selectionClick();
+      appsProvider
+          .exportApps(
+              pickOnly:
+                  pickOnly || (await settingsProvider.getExportDir()) == null,
+              sp: settingsProvider)
+          .then((String? result) {
+        if (result != null) {
+          showMessage(tr('exportedTo', args: [result]), context);
+        }
+      }).catchError((e) {
+        showError(e, context);
+      });
+    }
+
+    runObtainiumImport() {
+      HapticFeedback.selectionClick();
+      FilePicker.platform.pickFiles().then((result) {
+        setState(() {
+          importInProgress = true;
+        });
+        if (result != null) {
+          String data = File(result.files.single.path!).readAsStringSync();
+          try {
+            jsonDecode(data);
+          } catch (e) {
+            throw ObtainiumError(tr('invalidInput'));
+          }
+          appsProvider.importApps(data).then((value) {
+            var cats = settingsProvider.categories;
+            appsProvider.apps.forEach((key, value) {
+              for (var c in value.app.categories) {
+                if (!cats.containsKey(c)) {
+                  cats[c] = generateRandomLightColor().value;
+                }
+              }
+            });
+            appsProvider.addMissingCategories(settingsProvider);
+            showMessage(
+                tr('importedX', args: [plural('apps', value)]), context);
+          });
+        } else {
+          // User canceled the picker
+        }
+      }).catchError((e) {
+        showError(e, context);
+      }).whenComplete(() {
+        setState(() {
+          importInProgress = false;
+        });
+      });
+    }
+
+    runUrlImport() {
+      FilePicker.platform.pickFiles().then((result) {
+        if (result != null) {
+          urlListImport(
+              overrideInitValid: true,
+              initValue: RegExp('https?://[^"]+')
+                  .allMatches(
+                      File(result.files.single.path!).readAsStringSync())
+                  .map((e) => e.input.substring(e.start, e.end))
+                  .toSet()
+                  .toList()
+                  .where((url) {
+                try {
+                  sourceProvider.getSource(url);
+                  return true;
+                } catch (e) {
+                  return false;
+                }
+              }).join('\n'));
+        }
+      });
+    }
+
+    runSourceSearch(AppSource source) {
+      () async {
+        var values = await showDialog<Map<String, dynamic>?>(
+            context: context,
+            builder: (BuildContext ctx) {
+              return GeneratedFormModal(
+                title: tr('searchX', args: [source.name]),
+                items: [
+                  [
+                    GeneratedFormTextField('searchQuery',
+                        label: tr('searchQuery'))
+                  ],
+                  ...source.searchQuerySettingFormItems.map((e) => [e])
+                ],
+              );
+            });
+        if (values != null &&
+            (values['searchQuery'] as String?)?.isNotEmpty == true) {
+          setState(() {
+            importInProgress = true;
+          });
+          var urlsWithDescriptions = await source
+              .search(values['searchQuery'] as String, querySettings: values);
+          if (urlsWithDescriptions.isNotEmpty) {
+            var selectedUrls =
+                // ignore: use_build_context_synchronously
+                await showDialog<List<String>?>(
+                    context: context,
+                    builder: (BuildContext ctx) {
+                      return UrlSelectionModal(
+                        urlsWithDescriptions: urlsWithDescriptions,
+                        selectedByDefault: false,
+                      );
+                    });
+            if (selectedUrls != null && selectedUrls.isNotEmpty) {
+              var errors = await appsProvider.addAppsByURL(selectedUrls);
+              if (errors.isEmpty) {
+                // ignore: use_build_context_synchronously
+                showMessage(
+                    tr('importedX',
+                        args: [plural('apps', selectedUrls.length)]),
+                    context);
+              } else {
+                // ignore: use_build_context_synchronously
+                showDialog(
+                    context: context,
+                    builder: (BuildContext ctx) {
+                      return ImportErrorDialog(
+                          urlsLength: selectedUrls.length, errors: errors);
+                    });
+              }
+            }
+          } else {
+            throw ObtainiumError(tr('noResults'));
+          }
+        }
+      }()
+          .catchError((e) {
+        showError(e, context);
+      }).whenComplete(() {
+        setState(() {
+          importInProgress = false;
+        });
+      });
+    }
+
+    runMassSourceImport(MassAppUrlSource source) {
+      () async {
+        var values = await showDialog<Map<String, dynamic>?>(
+            context: context,
+            builder: (BuildContext ctx) {
+              return GeneratedFormModal(
+                title: tr('importX', args: [source.name]),
+                items: source.requiredArgs
+                    .map((e) => [GeneratedFormTextField(e, label: e)])
+                    .toList(),
+              );
+            });
+        if (values != null) {
+          setState(() {
+            importInProgress = true;
+          });
+          var urlsWithDescriptions = await source.getUrlsWithDescriptions(
+              values.values.map((e) => e.toString()).toList());
+          var selectedUrls =
+              // ignore: use_build_context_synchronously
+              await showDialog<List<String>?>(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return UrlSelectionModal(
+                        urlsWithDescriptions: urlsWithDescriptions);
+                  });
+          if (selectedUrls != null) {
+            var errors = await appsProvider.addAppsByURL(selectedUrls);
+            if (errors.isEmpty) {
+              // ignore: use_build_context_synchronously
+              showMessage(
+                  tr('importedX', args: [plural('apps', selectedUrls.length)]),
+                  context);
+            } else {
+              // ignore: use_build_context_synchronously
+              showDialog(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return ImportErrorDialog(
+                        urlsLength: selectedUrls.length, errors: errors);
+                  });
+            }
+          }
+        }
+      }()
+          .catchError((e) {
+        showError(e, context);
+      }).whenComplete(() {
+        setState(() {
+          importInProgress = false;
+        });
+      });
+    }
+
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
         body: CustomScrollView(slivers: <Widget>[
@@ -52,94 +310,89 @@ class _ImportExportPageState extends State<ImportExportPage> {
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      Row(
-                        children: [
-                          Expanded(
-                              child: TextButton(
-                                  style: outlineButtonStyle,
-                                  onPressed: appsProvider.apps.isEmpty ||
-                                          importInProgress
-                                      ? null
-                                      : () {
-                                          HapticFeedback.selectionClick();
-                                          appsProvider
-                                              .exportApps()
-                                              .then((String path) {
-                                            showError(
-                                                tr('exportedTo', args: [path]),
-                                                context);
-                                          }).catchError((e) {
-                                            showError(e, context);
-                                          });
-                                        },
-                                  child: Text(tr('obtainiumExport')))),
-                          const SizedBox(
-                            width: 16,
-                          ),
-                          Expanded(
-                              child: TextButton(
-                                  style: outlineButtonStyle,
-                                  onPressed: importInProgress
-                                      ? null
-                                      : () {
-                                          HapticFeedback.selectionClick();
-                                          FilePicker.platform
-                                              .pickFiles()
-                                              .then((result) {
-                                            setState(() {
-                                              importInProgress = true;
-                                            });
-                                            if (result != null) {
-                                              String data = File(
-                                                      result.files.single.path!)
-                                                  .readAsStringSync();
-                                              try {
-                                                jsonDecode(data);
-                                              } catch (e) {
-                                                throw ObtainiumError(
-                                                    tr('invalidInput'));
-                                              }
-                                              appsProvider
-                                                  .importApps(data)
-                                                  .then((value) {
-                                                var cats =
-                                                    settingsProvider.categories;
-                                                appsProvider.apps
-                                                    .forEach((key, value) {
-                                                  for (var c
-                                                      in value.app.categories) {
-                                                    if (!cats.containsKey(c)) {
-                                                      cats[c] =
-                                                          generateRandomLightColor()
-                                                              .value;
-                                                    }
-                                                  }
-                                                });
-                                                settingsProvider.categories =
-                                                    cats;
-                                                showError(
-                                                    tr('importedX', args: [
-                                                      plural('apps', value)
-                                                    ]),
-                                                    context);
-                                              });
-                                            } else {
-                                              // User canceled the picker
+                      FutureBuilder(
+                        future: settingsProvider.getExportDir(),
+                        builder: (context, snapshot) {
+                          return Column(
+                            children: [
+                              Row(
+                                children: [
+                                  Expanded(
+                                      child: TextButton(
+                                    style: outlineButtonStyle,
+                                    onPressed: appsProvider.apps.isEmpty ||
+                                            importInProgress
+                                        ? null
+                                        : () {
+                                            runObtainiumExport(pickOnly: true);
+                                          },
+                                    child: Text(tr('pickExportDir')),
+                                  )),
+                                  const SizedBox(
+                                    width: 16,
+                                  ),
+                                  Expanded(
+                                      child: TextButton(
+                                    style: outlineButtonStyle,
+                                    onPressed: appsProvider.apps.isEmpty ||
+                                            importInProgress ||
+                                            snapshot.data == null
+                                        ? null
+                                        : runObtainiumExport,
+                                    child: Text(tr('obtainiumExport')),
+                                  )),
+                                ],
+                              ),
+                              const SizedBox(
+                                height: 8,
+                              ),
+                              Row(
+                                children: [
+                                  Expanded(
+                                      child: TextButton(
+                                          style: outlineButtonStyle,
+                                          onPressed: importInProgress
+                                              ? null
+                                              : runObtainiumImport,
+                                          child: Text(tr('obtainiumImport')))),
+                                ],
+                              ),
+                              if (snapshot.data != null)
+                                Column(
+                                  children: [
+                                    const SizedBox(height: 16),
+                                    GeneratedForm(
+                                        items: [
+                                          [
+                                            GeneratedFormSwitch(
+                                              'autoExportOnChanges',
+                                              label: tr('autoExportOnChanges'),
+                                              defaultValue: settingsProvider
+                                                  .autoExportOnChanges,
+                                            )
+                                          ]
+                                        ],
+                                        onValueChanges:
+                                            (value, valid, isBuilding) {
+                                          if (valid && !isBuilding) {
+                                            if (value['autoExportOnChanges'] !=
+                                                null) {
+                                              settingsProvider
+                                                  .autoExportOnChanges = value[
+                                                      'autoExportOnChanges'] ==
+                                                  true;
                                             }
-                                          }).catchError((e) {
-                                            showError(e, context);
-                                          }).whenComplete(() {
-                                            setState(() {
-                                              importInProgress = false;
-                                            });
-                                          });
-                                        },
-                                  child: Text(tr('obtainiumImport'))))
-                        ],
+                                          }
+                                        }),
+                                  ],
+                                ),
+                            ],
+                          );
+                        },
                       ),
                       if (importInProgress)
-                        Column(
-                          children: const [
+                        const Column(
+                          children: [
                             SizedBox(
                               height: 14,
                             ),
@@ -150,88 +403,26 @@ class _ImportExportPageState extends State<ImportExportPage> {
                           ],
                         )
                       else
-                        const Divider(
-                          height: 32,
+                        Column(
+                          children: [
+                            const Divider(
+                              height: 32,
+                            ),
+                            TextButton(
+                                onPressed:
+                                    importInProgress ? null : urlListImport,
+                                child: Text(
+                                  tr('importFromURLList'),
+                                )),
+                            const SizedBox(height: 8),
+                            TextButton(
+                                onPressed:
+                                    importInProgress ? null : runUrlImport,
+                                child: Text(
+                                  tr('importFromURLsInFile'),
+                                )),
+                          ],
                         ),
-                      TextButton(
-                          onPressed: importInProgress
-                              ? null
-                              : () {
-                                  showDialog<Map<String, dynamic>?>(
-                                      context: context,
-                                      builder: (BuildContext ctx) {
-                                        return GeneratedFormModal(
-                                          title: tr('importFromURLList'),
-                                          items: [
-                                            [
-                                              GeneratedFormTextField(
-                                                  'appURLList',
-                                                  label: tr('appURLList'),
-                                                  max: 7,
-                                                  additionalValidators: [
-                                                    (dynamic value) {
-                                                      if (value != null &&
-                                                          value.isNotEmpty) {
-                                                        var lines = value
-                                                            .trim()
-                                                            .split('\n');
-                                                        for (int i = 0;
-                                                            i < lines.length;
-                                                            i++) {
-                                                          try {
-                                                            sourceProvider
-                                                                .getSource(
-                                                                    lines[i]);
-                                                          } catch (e) {
-                                                            return '${tr('line')} ${i + 1}: $e';
-                                                          }
-                                                        }
-                                                      }
-                                                      return null;
-                                                    }
-                                                  ])
-                                            ]
-                                          ],
-                                        );
-                                      }).then((values) {
-                                    if (values != null) {
-                                      var urls =
-                                          (values['appURLList'] as String)
-                                              .split('\n');
-                                      setState(() {
-                                        importInProgress = true;
-                                      });
-                                      appsProvider
-                                          .addAppsByURL(urls)
-                                          .then((errors) {
-                                        if (errors.isEmpty) {
-                                          showError(
-                                              tr('importedX', args: [
-                                                plural('apps', urls.length)
-                                              ]),
-                                              context);
-                                        } else {
-                                          showDialog(
-                                              context: context,
-                                              builder: (BuildContext ctx) {
-                                                return ImportErrorDialog(
-                                                    urlsLength: urls.length,
-                                                    errors: errors);
-                                              });
-                                        }
-                                      }).catchError((e) {
-                                        showError(e, context);
-                                      }).whenComplete(() {
-                                        setState(() {
-                                          importInProgress = false;
-                                        });
-                                      });
-                                    }
-                                  });
-                                },
-                          child: Text(
-                            tr('importFromURLList'),
-                          )),
                       ...sourceProvider.sources
                           .where((element) => element.canSearch)
                           .map((source) => Column(
@@ -243,104 +434,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                         onPressed: importInProgress
                                             ? null
                                             : () {
-                                                () async {
-                                                  var values = await showDialog<
-                                                          Map<String,
-                                                              dynamic>?>(
-                                                      context: context,
-                                                      builder:
-                                                          (BuildContext ctx) {
-                                                        return GeneratedFormModal(
-                                                          title: tr('searchX',
-                                                              args: [
-                                                                source.name
-                                                              ]),
-                                                          items: [
-                                                            [
-                                                              GeneratedFormTextField(
-                                                                  'searchQuery',
-                                                                  label: tr(
-                                                                      'searchQuery'))
-                                                            ]
-                                                          ],
-                                                        );
-                                                      });
-                                                  if (values != null &&
-                                                      (values['searchQuery']
-                                                                  as String?)
-                                                              ?.isNotEmpty ==
-                                                          true) {
-                                                    setState(() {
-                                                      importInProgress = true;
-                                                    });
-                                                    var urlsWithDescriptions =
-                                                        await source.search(
-                                                            values['searchQuery']
-                                                                as String);
-                                                    if (urlsWithDescriptions
-                                                        .isNotEmpty) {
-                                                      var selectedUrls =
-                                                          await showDialog<
-                                                                  List<
-                                                                      String>?>(
-                                                              context: context,
-                                                              builder:
-                                                                  (BuildContext
-                                                                      ctx) {
-                                                                return UrlSelectionModal(
-                                                                  urlsWithDescriptions:
-                                                                      urlsWithDescriptions,
-                                                                  selectedByDefault:
-                                                                      false,
-                                                                );
-                                                              });
-                                                      if (selectedUrls !=
-                                                              null &&
-                                                          selectedUrls
-                                                              .isNotEmpty) {
-                                                        var errors =
-                                                            await appsProvider
-                                                                .addAppsByURL(
-                                                                    selectedUrls);
-                                                        if (errors.isEmpty) {
-                                                          // ignore: use_build_context_synchronously
-                                                          showError(
-                                                              tr('importedX',
-                                                                  args: [
-                                                                    plural(
-                                                                        'app',
-                                                                        selectedUrls
-                                                                            .length)
-                                                                  ]),
-                                                              context);
-                                                        } else {
-                                                          showDialog(
-                                                              context: context,
-                                                              builder:
-                                                                  (BuildContext
-                                                                      ctx) {
-                                                                return ImportErrorDialog(
-                                                                    urlsLength:
-                                                                        selectedUrls
-                                                                            .length,
-                                                                    errors:
-                                                                        errors);
-                                                              });
-                                                        }
-                                                      }
-                                                    } else {
-                                                      throw ObtainiumError(
-                                                          tr('noResults'));
-                                                    }
-                                                  }
-                                                }()
-                                                    .catchError((e) {
-                                                  showError(e, context);
-                                                }).whenComplete(() {
-                                                  setState(() {
-                                                    importInProgress = false;
-                                                  });
-                                                });
+                                                runSourceSearch(source);
                                               },
                                         child: Text(
                                             tr('searchX', args: [source.name])))
@@ -356,91 +450,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                         onPressed: importInProgress
                                             ? null
                                             : () {
-                                                () async {
-                                                  var values = await showDialog<
-                                                          Map<String,
-                                                              dynamic>?>(
-                                                      context: context,
-                                                      builder:
-                                                          (BuildContext ctx) {
-                                                        return GeneratedFormModal(
-                                                          title: tr('importX',
-                                                              args: [
-                                                                source.name
-                                                              ]),
-                                                          items:
-                                                              source
-                                                                  .requiredArgs
-                                                                  .map(
-                                                                      (e) => [
-                                                                            GeneratedFormTextField(e,
-                                                                                label: e)
-                                                                          ])
-                                                                  .toList(),
-                                                        );
-                                                      });
-                                                  if (values != null) {
-                                                    setState(() {
-                                                      importInProgress = true;
-                                                    });
-                                                    var urlsWithDescriptions =
-                                                        await source
-                                                            .getUrlsWithDescriptions(
-                                                                values.values
-                                                                    .map((e) =>
-                                                                        e.toString())
-                                                                    .toList());
-                                                    var selectedUrls =
-                                                        await showDialog<
-                                                                List<String>?>(
-                                                            context: context,
-                                                            builder:
-                                                                (BuildContext
-                                                                    ctx) {
-                                                              return UrlSelectionModal(
-                                                                  urlsWithDescriptions:
-                                                                      urlsWithDescriptions);
-                                                            });
-                                                    if (selectedUrls != null) {
-                                                      var errors =
-                                                          await appsProvider
-                                                              .addAppsByURL(
-                                                                  selectedUrls);
-                                                      if (errors.isEmpty) {
-                                                        // ignore: use_build_context_synchronously
-                                                        showError(
-                                                            tr('importedX',
-                                                                args: [
-                                                                  plural(
-                                                                      'app',
-                                                                      selectedUrls
-                                                                          .length)
-                                                                ]),
-                                                            context);
-                                                      } else {
-                                                        showDialog(
-                                                            context: context,
-                                                            builder:
-                                                                (BuildContext
-                                                                    ctx) {
-                                                              return ImportErrorDialog(
-                                                                  urlsLength:
-                                                                      selectedUrls
-                                                                          .length,
-                                                                  errors:
-                                                                      errors);
-                                                            });
-                                                      }
-                                                    }
-                                                  }
-                                                }()
-                                                    .catchError((e) {
-                                                  showError(e, context);
-                                                }).whenComplete(() {
-                                                  setState(() {
-                                                    importInProgress = false;
-                                                  });
-                                                });
+                                                runMassSourceImport(source);
                                               },
                                         child: Text(
                                             tr('importX', args: [source.name])))
@@ -456,7 +466,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                               fontStyle: FontStyle.italic, fontSize: 12)),
                       const SizedBox(
                         height: 8,
-                      )
+                      ),
                     ],
                   )))
         ]));
@@ -528,7 +538,7 @@ class UrlSelectionModal extends StatefulWidget {
       this.selectedByDefault = true,
       this.onlyOneSelectionAllowed = false});
 
-  Map<String, String> urlsWithDescriptions;
+  Map<String, List<String>> urlsWithDescriptions;
   bool selectedByDefault;
   bool onlyOneSelectionAllowed;
 
@@ -537,7 +547,7 @@ class UrlSelectionModal extends StatefulWidget {
 }
 
 class _UrlSelectionModalState extends State<UrlSelectionModal> {
-  Map<MapEntry<String, String>, bool> urlWithDescriptionSelections = {};
+  Map<MapEntry<String, List<String>>, bool> urlWithDescriptionSelections = {};
   @override
   void initState() {
     super.initState();
@@ -564,18 +574,79 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
           widget.onlyOneSelectionAllowed ? tr('selectURL') : tr('selectURLs')),
       content: Column(children: [
         ...urlWithDescriptionSelections.keys.map((urlWithD) {
-          return Row(children: [
+          selectThis(bool? value) {
+            setState(() {
+              value ??= false;
+              if (value! && widget.onlyOneSelectionAllowed) {
+                selectOnlyOne(urlWithD.key);
+              } else {
+                urlWithDescriptionSelections[urlWithD] = value!;
+              }
+            });
+          }
+
+          var urlLink = GestureDetector(
+              onTap: () {
+                launchUrlString(urlWithD.key,
+                    mode: LaunchMode.externalApplication);
+              },
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    urlWithD.value[0],
+                    style: const TextStyle(
+                        decoration: TextDecoration.underline,
+                        fontWeight: FontWeight.bold),
+                    textAlign: TextAlign.start,
+                  ),
+                  Text(
+                    Uri.parse(urlWithD.key).host,
+                    style: const TextStyle(
+                        decoration: TextDecoration.underline, fontSize: 12),
+                  )
+                ],
+              ));
+
+          var descriptionText = Text(
+            urlWithD.value[1].length > 128
+                ? '${urlWithD.value[1].substring(0, 128)}...'
+                : urlWithD.value[1],
+            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<String>(
+              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) {
-                  setState(() {
-                    value ??= false;
-                    if (value! && widget.onlyOneSelectionAllowed) {
-                      selectOnlyOne(urlWithD.key);
-                    } else {
-                      urlWithDescriptionSelections[urlWithD] = value!;
-                    }
-                  });
+                  selectThis(value);
                 }),
             const SizedBox(
               width: 8,
@@ -588,23 +659,13 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
                 const SizedBox(
                   height: 8,
                 ),
+                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,
-                    )),
-                Text(
-                  urlWithD.value.length > 128
-                      ? '${urlWithD.value.substring(0, 128)}...'
-                      : urlWithD.value,
-                  style: const TextStyle(
-                      fontStyle: FontStyle.italic, fontSize: 12),
+                  onTap: () {
+                    selectThis(
+                        !(urlWithDescriptionSelections[urlWithD] ?? false));
+                  },
+                  child: descriptionText,
                 ),
                 const SizedBox(
                   height: 8,
@@ -612,6 +673,10 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
               ],
             ))
           ]);
+
+          return widget.onlyOneSelectionAllowed
+              ? singleSelectTile
+              : multiSelectTile;
         })
       ]),
       actions: [

lib/pages/settings.dart

@@ -1,10 +1,9 @@
-import 'dart:math';
-
+import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
-import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
 import 'package:obtainium/providers/apps_provider.dart';
@@ -22,21 +21,6 @@ class SettingsPage extends StatefulWidget {
   State<SettingsPage> createState() => _SettingsPageState();
 }
 
-// Generates a random light color
-// Courtesy of ChatGPT 😭 (with a bugfix 🥳)
-Color generateRandomLightColor() {
-  // Create a random number generator
-  final Random random = Random();
-
-  // Generate random hue, saturation, and value values
-  final double hue = random.nextDouble() * 360;
-  final double saturation = 0.5 + random.nextDouble() * 0.5;
-  final double value = 0.9 + random.nextDouble() * 0.1;
-
-  // Create a HSV color with the random values
-  return HSVColor.fromAHSV(1.0, hue, saturation, value).toColor();
-}
-
 class _SettingsPageState extends State<SettingsPage> {
   @override
   Widget build(BuildContext context) {
@@ -89,6 +73,7 @@ class _SettingsPageState extends State<SettingsPage> {
         });
 
     var sortDropdown = DropdownButtonFormField(
+        isExpanded: true,
         decoration: InputDecoration(labelText: tr('appSortBy')),
         value: settingsProvider.sortColumn,
         items: [
@@ -103,6 +88,10 @@ class _SettingsPageState extends State<SettingsPage> {
           DropdownMenuItem(
             value: SortColumnSettings.added,
             child: Text(tr('asAdded')),
+          ),
+          DropdownMenuItem(
+            value: SortColumnSettings.releaseDate,
+            child: Text(tr('releaseDate')),
           )
         ],
         onChanged: (value) {
@@ -112,6 +101,7 @@ class _SettingsPageState extends State<SettingsPage> {
         });
 
     var orderDropdown = DropdownButtonFormField(
+        isExpanded: true,
         decoration: InputDecoration(labelText: tr('appSortOrder')),
         value: settingsProvider.sortOrder,
         items: [
@@ -139,8 +129,8 @@ class _SettingsPageState extends State<SettingsPage> {
             child: Text(tr('followSystem')),
           ),
           ...supportedLocales.map((e) => DropdownMenuItem(
-                value: e.toLanguageTag(),
-                child: Text(e.toLanguageTag().toUpperCase()),
+                value: e.key.toLanguageTag(),
+                child: Text(e.value),
               ))
         ],
         onChanged: (value) {
@@ -148,7 +138,7 @@ class _SettingsPageState extends State<SettingsPage> {
           if (value != null) {
             context.setLocale(Locale(value));
           } else {
-            context.resetLocale();
+            settingsProvider.resetLocaleSafe(context);
           }
         });
 
@@ -178,9 +168,9 @@ class _SettingsPageState extends State<SettingsPage> {
         });
 
     var sourceSpecificFields = sourceProvider.sources.map((e) {
-      if (e.additionalSourceSpecificSettingFormItems.isNotEmpty) {
+      if (e.sourceConfigSettingFormItems.isNotEmpty) {
         return GeneratedForm(
-            items: e.additionalSourceSpecificSettingFormItems.map((e) {
+            items: e.sourceConfigSettingFormItems.map((e) {
               e.defaultValue = settingsProvider.getSettingString(e.key);
               return [e];
             }).toList(),
@@ -196,10 +186,18 @@ class _SettingsPageState extends State<SettingsPage> {
       }
     });
 
+    const height8 = SizedBox(
+      height: 8,
+    );
+
     const height16 = SizedBox(
       height: 16,
     );
 
+    const height32 = SizedBox(
+      height: 32,
+    );
+
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
         body: CustomScrollView(slivers: <Widget>[
@@ -212,13 +210,151 @@ class _SettingsPageState extends State<SettingsPage> {
                       : Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
+                            Text(
+                              tr('updates'),
+                              style: TextStyle(
+                                  fontWeight: FontWeight.bold,
+                                  color: Theme.of(context).colorScheme.primary),
+                            ),
+                            intervalDropdown,
+                            FutureBuilder(
+                                builder: (ctx, val) {
+                                  return (val.data?.version.sdkInt ?? 0) >= 30
+                                      ? Column(
+                                          crossAxisAlignment:
+                                              CrossAxisAlignment.start,
+                                          children: [
+                                            height16,
+                                            Row(
+                                              mainAxisAlignment:
+                                                  MainAxisAlignment
+                                                      .spaceBetween,
+                                              children: [
+                                                Flexible(
+                                                    child: Text(tr(
+                                                        'enableBackgroundUpdates'))),
+                                                Switch(
+                                                    value: settingsProvider
+                                                        .enableBackgroundUpdates,
+                                                    onChanged: (value) {
+                                                      settingsProvider
+                                                              .enableBackgroundUpdates =
+                                                          value;
+                                                    })
+                                              ],
+                                            ),
+                                            height8,
+                                            Text(tr('backgroundUpdateReqsExplanation'),
+                                                style: Theme.of(context)
+                                                    .textTheme
+                                                    .labelSmall),
+                                            Text(tr('backgroundUpdateLimitsExplanation'),
+                                                style: Theme.of(context)
+                                                    .textTheme
+                                                    .labelSmall),
+                                            height8,
+                                            if (settingsProvider
+                                                .enableBackgroundUpdates)
+                                              Column(
+                                                children: [
+                                                  height16,
+                                                  Row(
+                                                    mainAxisAlignment:
+                                                        MainAxisAlignment
+                                                            .spaceBetween,
+                                                    children: [
+                                                      Flexible(
+                                                          child: Text(tr(
+                                                              'bgUpdatesOnWiFiOnly'))),
+                                                      Switch(
+                                                          value: settingsProvider
+                                                              .bgUpdatesOnWiFiOnly,
+                                                          onChanged: (value) {
+                                                            settingsProvider
+                                                                    .bgUpdatesOnWiFiOnly =
+                                                                value;
+                                                          })
+                                                    ],
+                                                  ),
+                                                ],
+                                              ),
+                                          ],
+                                        )
+                                      : const SizedBox.shrink();
+                                },
+                                future: DeviceInfoPlugin().androidInfo),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(child: Text(tr('checkOnStart'))),
+                                Switch(
+                                    value: settingsProvider.checkOnStart,
+                                    onChanged: (value) {
+                                      settingsProvider.checkOnStart = value;
+                                    })
+                              ],
+                            ),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child: Text(tr('checkUpdateOnDetailPage'))),
+                                Switch(
+                                    value: settingsProvider
+                                        .checkUpdateOnDetailPage,
+                                    onChanged: (value) {
+                                      settingsProvider.checkUpdateOnDetailPage =
+                                          value;
+                                    })
+                              ],
+                            ),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child: Text(tr(
+                                        'onlyCheckInstalledOrTrackOnlyApps'))),
+                                Switch(
+                                    value: settingsProvider
+                                        .onlyCheckInstalledOrTrackOnlyApps,
+                                    onChanged: (value) {
+                                      settingsProvider
+                                              .onlyCheckInstalledOrTrackOnlyApps =
+                                          value;
+                                    })
+                              ],
+                            ),
+                            height32,
+                            Text(
+                              tr('sourceSpecific'),
+                              style: TextStyle(
+                                  fontWeight: FontWeight.bold,
+                                  color: Theme.of(context).colorScheme.primary),
+                            ),
+                            ...sourceSpecificFields,
+                            height32,
                             Text(
                               tr('appearance'),
                               style: TextStyle(
+                                  fontWeight: FontWeight.bold,
                                   color: Theme.of(context).colorScheme.primary),
                             ),
                             themeDropdown,
                             height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(child: Text(tr('useBlackTheme'))),
+                                Switch(
+                                    value: settingsProvider.useBlackTheme,
+                                    onChanged: (value) {
+                                      settingsProvider.useBlackTheme = value;
+                                    })
+                              ],
+                            ),
                             colourDropdown,
                             height16,
                             Row(
@@ -238,7 +374,7 @@ class _SettingsPageState extends State<SettingsPage> {
                             Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [
-                                Text(tr('showWebInAppView')),
+                                Flexible(child: Text(tr('showWebInAppView'))),
                                 Switch(
                                     value: settingsProvider.showAppWebpage,
                                     onChanged: (value) {
@@ -250,7 +386,7 @@ class _SettingsPageState extends State<SettingsPage> {
                             Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [
-                                Text(tr('pinUpdates')),
+                                Flexible(child: Text(tr('pinUpdates'))),
                                 Switch(
                                     value: settingsProvider.pinUpdates,
                                     onChanged: (value) {
@@ -258,31 +394,133 @@ class _SettingsPageState extends State<SettingsPage> {
                                     })
                               ],
                             ),
-                            const Divider(
-                              height: 16,
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child: Text(
+                                        tr('moveNonInstalledAppsToBottom'))),
+                                Switch(
+                                    value: settingsProvider.buryNonInstalled,
+                                    onChanged: (value) {
+                                      settingsProvider.buryNonInstalled = value;
+                                    })
+                              ],
                             ),
                             height16,
-                            Text(
-                              tr('updates'),
-                              style: TextStyle(
-                                  color: Theme.of(context).colorScheme.primary),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child:
+                                        Text(tr('removeOnExternalUninstall'))),
+                                Switch(
+                                    value: settingsProvider
+                                        .removeOnExternalUninstall,
+                                    onChanged: (value) {
+                                      settingsProvider
+                                          .removeOnExternalUninstall = value;
+                                    })
+                              ],
                             ),
-                            intervalDropdown,
-                            const Divider(
-                              height: 48,
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(child: Text(tr('groupByCategory'))),
+                                Switch(
+                                    value: settingsProvider.groupByCategory,
+                                    onChanged: (value) {
+                                      settingsProvider.groupByCategory = value;
+                                    })
+                              ],
                             ),
-                            Text(
-                              tr('sourceSpecific'),
-                              style: TextStyle(
-                                  color: Theme.of(context).colorScheme.primary),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child:
+                                        Text(tr('dontShowTrackOnlyWarnings'))),
+                                Switch(
+                                    value:
+                                        settingsProvider.hideTrackOnlyWarning,
+                                    onChanged: (value) {
+                                      settingsProvider.hideTrackOnlyWarning =
+                                          value;
+                                    })
+                              ],
                             ),
-                            ...sourceSpecificFields,
-                            const Divider(
-                              height: 48,
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child:
+                                        Text(tr('dontShowAPKOriginWarnings'))),
+                                Switch(
+                                    value:
+                                        settingsProvider.hideAPKOriginWarning,
+                                    onChanged: (value) {
+                                      settingsProvider.hideAPKOriginWarning =
+                                          value;
+                                    })
+                              ],
                             ),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child: Text(tr('disablePageTransitions'))),
+                                Switch(
+                                    value:
+                                        settingsProvider.disablePageTransitions,
+                                    onChanged: (value) {
+                                      settingsProvider.disablePageTransitions =
+                                          value;
+                                    })
+                              ],
+                            ),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child: Text(tr('reversePageTransitions'))),
+                                Switch(
+                                    value:
+                                        settingsProvider.reversePageTransitions,
+                                    onChanged: settingsProvider
+                                            .disablePageTransitions
+                                        ? null
+                                        : (value) {
+                                            settingsProvider
+                                                .reversePageTransitions = value;
+                                          })
+                              ],
+                            ),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child: Text(tr('highlightTouchTargets'))),
+                                Switch(
+                                    value:
+                                        settingsProvider.highlightTouchTargets,
+                                    onChanged: (value) {
+                                      settingsProvider.highlightTouchTargets =
+                                          value;
+                                    })
+                              ],
+                            ),
+                            height32,
                             Text(
                               tr('categories'),
                               style: TextStyle(
+                                  fontWeight: FontWeight.bold,
                                   color: Theme.of(context).colorScheme.primary),
                             ),
                             height16,
@@ -314,7 +552,8 @@ class _SettingsPageState extends State<SettingsPage> {
                         onPressed: () {
                           context.read<LogsProvider>().get().then((logs) {
                             if (logs.isEmpty) {
-                              showError(ObtainiumError(tr('noLogs')), context);
+                              showMessage(
+                                  ObtainiumError(tr('noLogs')), context);
                             } else {
                               showDialog(
                                   context: context,
@@ -328,7 +567,41 @@ class _SettingsPageState extends State<SettingsPage> {
                         label: Text(tr('appLogs'))),
                   ],
                 ),
-                height16,
+                const Divider(
+                  height: 32,
+                ),
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+                  child: Column(children: [
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Flexible(child: Text(tr('debugMenu'))),
+                        Switch(
+                            value: settingsProvider.showDebugOpts,
+                            onChanged: (value) {
+                              settingsProvider.showDebugOpts = value;
+                            })
+                      ],
+                    ),
+                    if (settingsProvider.showDebugOpts)
+                      Column(
+                        crossAxisAlignment: CrossAxisAlignment.stretch,
+                        children: [
+                          height16,
+                          TextButton(
+                              onPressed: () {
+                                AndroidAlarmManager.oneShot(
+                                    const Duration(seconds: 0),
+                                    bgUpdateCheckAlarmId + 200,
+                                    bgUpdateCheck);
+                                showMessage(tr('bgTaskStarted'), context);
+                              },
+                              child: Text(tr('runBgCheckNow')))
+                        ],
+                      ),
+                  ]),
+                ),
               ],
             ),
           )
@@ -428,6 +701,7 @@ class _CategoryEditorSelectorState extends State<CategoryEditorSelector> {
   @override
   Widget build(BuildContext context) {
     var settingsProvider = context.watch<SettingsProvider>();
+    var appsProvider = context.watch<AppsProvider>();
     storedValues = settingsProvider.categories.map((key, value) => MapEntry(
         key,
         MapEntry(value,
@@ -451,8 +725,9 @@ class _CategoryEditorSelectorState extends State<CategoryEditorSelector> {
           if (!isBuilding) {
             storedValues =
                 values['categories'] as Map<String, MapEntry<int, bool>>;
-            settingsProvider.categories =
-                storedValues.map((key, value) => MapEntry(key, value.key));
+            settingsProvider.setCategories(
+                storedValues.map((key, value) => MapEntry(key, value.key)),
+                appsProvider: appsProvider);
             if (widget.onSelected != null) {
               widget.onSelected!(storedValues.keys
                   .where((k) => storedValues[k]!.value)

lib/providers/notifications_provider.dart

@@ -22,52 +22,82 @@ class ObtainiumNotification {
 }
 
 class UpdateNotification extends ObtainiumNotification {
-  UpdateNotification(List<App> updates)
+  UpdateNotification(List<App> updates, {int? id})
       : super(
-            2,
+            id ?? 2,
             tr('updatesAvailable'),
             '',
             'UPDATES_AVAILABLE',
-            tr('updatesAvailable'),
+            tr('updatesAvailableNotifChannel'),
             tr('updatesAvailableNotifDescription'),
             Importance.max) {
     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()]);
   }
 }
 
 class SilentUpdateNotification extends ObtainiumNotification {
-  SilentUpdateNotification(List<App> updates)
-      : super(3, tr('appsUpdated'), '', 'APPS_UPDATED', tr('appsUpdated'),
-            tr('appsUpdatedNotifDescription'), Importance.defaultImportance) {
+  SilentUpdateNotification(List<App> updates, {int? id})
+      : super(
+            id ?? 3,
+            tr('appsUpdated'),
+            '',
+            'APPS_UPDATED',
+            tr('appsUpdatedNotifChannel'),
+            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()]);
+  }
+}
+
+class SilentUpdateAttemptNotification extends ObtainiumNotification {
+  SilentUpdateAttemptNotification(List<App> updates, {int? id})
+      : super(
+            id ?? 3,
+            tr('appsPossiblyUpdated'),
+            '',
+            'APPS_POSSIBLY_UPDATED',
+            tr('appsPossiblyUpdatedNotifChannel'),
+            tr('appsPossiblyUpdatedNotifDescription'),
+            Importance.defaultImportance) {
+    message = updates.length == 1
+        ? tr('xWasPossiblyUpdatedToY',
+            args: [updates[0].finalName, updates[0].latestVersion])
+        : plural('xAndNMoreUpdatesPossiblyInstalled', updates.length - 1,
+            args: [updates[0].finalName, (updates.length - 1).toString()]);
   }
 }
 
 class ErrorCheckingUpdatesNotification extends ObtainiumNotification {
-  ErrorCheckingUpdatesNotification(String error)
+  ErrorCheckingUpdatesNotification(String error, {int? id})
       : super(
-            5,
+            id ?? 5,
             tr('errorCheckingUpdates'),
             error,
             'BG_UPDATE_CHECK_ERROR',
-            tr('errorCheckingUpdates'),
+            tr('errorCheckingUpdatesNotifChannel'),
             tr('errorCheckingUpdatesNotifDescription'),
             Importance.high);
 }
 
 class AppsRemovedNotification extends ObtainiumNotification {
   AppsRemovedNotification(List<List<String>> namedReasons)
-      : super(6, tr('appsRemoved'), '', 'APPS_REMOVED', tr('appsRemoved'),
-            tr('appsRemovedNotifDescription'), Importance.max) {
+      : super(
+            6,
+            tr('appsRemoved'),
+            '',
+            'APPS_REMOVED',
+            tr('appsRemovedNotifChannel'),
+            tr('appsRemovedNotifDescription'),
+            Importance.max) {
     message = '';
     for (var r in namedReasons) {
       message += '${tr('xWasRemovedDueToErrorY', args: [r[0], r[1]])} \n';
@@ -83,7 +113,7 @@ class DownloadNotification extends ObtainiumNotification {
             tr('downloadingX', args: [appName]),
             '',
             'APP_DOWNLOADING',
-            tr('downloadingX', args: [tr('app')]),
+            tr('downloadingXNotifChannel', args: [tr('app')]),
             tr('downloadNotifDescription'),
             Importance.low,
             onlyAlertOnce: true,
@@ -95,18 +125,21 @@ final completeInstallationNotification = ObtainiumNotification(
     tr('completeAppInstallation'),
     tr('obtainiumMustBeOpenToInstallApps'),
     'COMPLETE_INSTALL',
-    tr('completeAppInstallation'),
+    tr('completeAppInstallationNotifChannel'),
     tr('completeAppInstallationNotifDescription'),
     Importance.max);
 
-final checkingUpdatesNotification = ObtainiumNotification(
-    4,
-    tr('checkingForUpdates'),
-    '',
-    'BG_UPDATE_CHECK',
-    tr('checkingForUpdates'),
-    tr('checkingForUpdatesNotifDescription'),
-    Importance.min);
+class CheckingUpdatesNotification extends ObtainiumNotification {
+  CheckingUpdatesNotification(String appName)
+      : super(
+            4,
+            tr('checkingForUpdates'),
+            appName,
+            'BG_UPDATE_CHECK',
+            tr('checkingForUpdatesNotifChannel'),
+            tr('checkingForUpdatesNotifDescription'),
+            Importance.min);
+}
 
 class NotificationsProvider {
   FlutterLocalNotificationsPlugin notifications =
@@ -167,7 +200,8 @@ class NotificationsProvider {
                 progress: progPercent ?? 0,
                 maxProgress: 100,
                 showProgress: progPercent != null,
-                onlyAlertOnce: onlyAlertOnce)));
+                onlyAlertOnce: onlyAlertOnce,
+                indeterminate: progPercent != null && progPercent < 0)));
   }
 
   Future<void> notify(ObtainiumNotification notif,

lib/providers/settings_provider.dart

@@ -6,10 +6,13 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:obtainium/app_sources/github.dart';
-import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/main.dart';
+import 'package:obtainium/providers/apps_provider.dart';
+import 'package:obtainium/providers/source_provider.dart';
+import 'package:path_provider/path_provider.dart';
 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 obtainiumId = 'dev.imranr.obtainium';
@@ -18,7 +21,7 @@ enum ThemeSettings { system, light, dark }
 
 enum ColourSettings { basic, materialYou }
 
-enum SortColumnSettings { added, nameAuthor, authorName }
+enum SortColumnSettings { added, nameAuthor, authorName, releaseDate }
 
 enum SortOrderSettings { ascending, descending }
 
@@ -34,12 +37,15 @@ List<int> updateIntervals = [15, 30, 60, 120, 180, 360, 720, 1440, 4320, 0]
 
 class SettingsProvider with ChangeNotifier {
   SharedPreferences? prefs;
+  String? defaultAppDir;
+  bool justStarted = true;
 
   String sourceUrl = 'https://github.com/ImranR98/Obtainium';
 
   // Not done in constructor as we want to be able to await it
   Future<void> initializeSettings() async {
     prefs = await SharedPreferences.getInstance();
+    defaultAppDir = (await getExternalStorageDirectory())!.path;
     notifyListeners();
   }
 
@@ -63,6 +69,15 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
+  bool get useBlackTheme {
+    return prefs?.getBool('useBlackTheme') ?? false;
+  }
+
+  set useBlackTheme(bool useBlackTheme) {
+    prefs?.setBool('useBlackTheme', useBlackTheme);
+    notifyListeners();
+  }
+
   int get updateInterval {
     var min = prefs?.getInt('updateInterval') ?? 360;
     if (!updateIntervals.contains(min)) {
@@ -82,6 +97,15 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
+  bool get checkOnStart {
+    return prefs?.getBool('checkOnStart') ?? false;
+  }
+
+  set checkOnStart(bool checkOnStart) {
+    prefs?.setBool('checkOnStart', checkOnStart);
+    notifyListeners();
+  }
+
   SortColumnSettings get sortColumn {
     return SortColumnSettings.values[
         prefs?.getInt('sortColumn') ?? SortColumnSettings.nameAuthor.index];
@@ -110,16 +134,28 @@ class SettingsProvider with ChangeNotifier {
     return result;
   }
 
-  Future<void> getInstallPermission() async {
+  bool checkJustStarted() {
+    if (justStarted) {
+      justStarted = false;
+      return true;
+    }
+    return false;
+  }
+
+  Future<bool> getInstallPermission({bool enforce = false}) async {
     while (!(await Permission.requestInstallPackages.isGranted)) {
       // Explicit request as InstallPlugin request sometimes bugged
       Fluttertoast.showToast(
           msg: tr('pleaseAllowInstallPerm'), toastLength: Toast.LENGTH_LONG);
       if ((await Permission.requestInstallPackages.request()) ==
           PermissionStatus.granted) {
-        break;
+        return true;
+      }
+      if (!enforce) {
+        return false;
       }
     }
+    return true;
   }
 
   bool get showAppWebpage {
@@ -140,6 +176,42 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
+  bool get buryNonInstalled {
+    return prefs?.getBool('buryNonInstalled') ?? false;
+  }
+
+  set buryNonInstalled(bool show) {
+    prefs?.setBool('buryNonInstalled', show);
+    notifyListeners();
+  }
+
+  bool get groupByCategory {
+    return prefs?.getBool('groupByCategory') ?? false;
+  }
+
+  set groupByCategory(bool show) {
+    prefs?.setBool('groupByCategory', show);
+    notifyListeners();
+  }
+
+  bool get hideTrackOnlyWarning {
+    return prefs?.getBool('hideTrackOnlyWarning') ?? false;
+  }
+
+  set hideTrackOnlyWarning(bool show) {
+    prefs?.setBool('hideTrackOnlyWarning', show);
+    notifyListeners();
+  }
+
+  bool get hideAPKOriginWarning {
+    return prefs?.getBool('hideAPKOriginWarning') ?? false;
+  }
+
+  set hideAPKOriginWarning(bool show) {
+    prefs?.setBool('hideAPKOriginWarning', show);
+    notifyListeners();
+  }
+
   String? getSettingString(String settingId) {
     return prefs?.getString(settingId);
   }
@@ -152,7 +224,22 @@ class SettingsProvider with ChangeNotifier {
   Map<String, int> get categories =>
       Map<String, int>.from(jsonDecode(prefs?.getString('categories') ?? '{}'));
 
-  set categories(Map<String, int> cats) {
+  void setCategories(Map<String, int> cats, {AppsProvider? appsProvider}) {
+    if (appsProvider != null) {
+      List<App> changedApps = appsProvider
+          .getAppValues()
+          .map((a) {
+            var n1 = a.app.categories.length;
+            a.app.categories.removeWhere((c) => !cats.keys.contains(c));
+            return n1 > a.app.categories.length ? a.app : null;
+          })
+          .where((element) => element != null)
+          .map((e) => e as App)
+          .toList();
+      if (changedApps.isNotEmpty) {
+        appsProvider.saveApps(changedApps);
+      }
+    }
     prefs?.setString('categories', jsonEncode(cats));
     notifyListeners();
   }
@@ -160,7 +247,7 @@ class SettingsProvider with ChangeNotifier {
   String? get forcedLocale {
     var fl = prefs?.getString('forcedLocale');
     return supportedLocales
-            .where((element) => element.toLanguageTag() == fl)
+            .where((element) => element.key.toLanguageTag() == fl)
             .isNotEmpty
         ? fl
         : null;
@@ -170,7 +257,7 @@ class SettingsProvider with ChangeNotifier {
     if (fl == null) {
       prefs?.remove('forcedLocale');
     } else if (supportedLocales
-        .where((element) => element.toLanguageTag() == fl)
+        .where((element) => element.key.toLanguageTag() == fl)
         .isNotEmpty) {
       prefs?.setString('forcedLocale', fl);
     }
@@ -179,4 +266,153 @@ class SettingsProvider with ChangeNotifier {
 
   bool setEqual(Set<String> a, Set<String> b) =>
       a.length == b.length && a.union(b).length == a.length;
+
+  void resetLocaleSafe(BuildContext context) {
+    if (context.supportedLocales
+        .map((e) => e.languageCode)
+        .contains(context.deviceLocale.languageCode)) {
+      context.resetLocale();
+    } else {
+      context.setLocale(context.fallbackLocale!);
+      context.deleteSaveLocale();
+    }
+  }
+
+  bool get removeOnExternalUninstall {
+    return prefs?.getBool('removeOnExternalUninstall') ?? false;
+  }
+
+  set removeOnExternalUninstall(bool show) {
+    prefs?.setBool('removeOnExternalUninstall', show);
+    notifyListeners();
+  }
+
+  bool get checkUpdateOnDetailPage {
+    return prefs?.getBool('checkUpdateOnDetailPage') ?? true;
+  }
+
+  set checkUpdateOnDetailPage(bool show) {
+    prefs?.setBool('checkUpdateOnDetailPage', show);
+    notifyListeners();
+  }
+
+  bool get disablePageTransitions {
+    return prefs?.getBool('disablePageTransitions') ?? false;
+  }
+
+  set disablePageTransitions(bool show) {
+    prefs?.setBool('disablePageTransitions', show);
+    notifyListeners();
+  }
+
+  bool get reversePageTransitions {
+    return prefs?.getBool('reversePageTransitions') ?? false;
+  }
+
+  set reversePageTransitions(bool show) {
+    prefs?.setBool('reversePageTransitions', show);
+    notifyListeners();
+  }
+
+  bool get enableBackgroundUpdates {
+    return prefs?.getBool('enableBackgroundUpdates') ?? true;
+  }
+
+  set enableBackgroundUpdates(bool val) {
+    prefs?.setBool('enableBackgroundUpdates', val);
+    notifyListeners();
+  }
+
+  bool get bgUpdatesOnWiFiOnly {
+    return prefs?.getBool('bgUpdatesOnWiFiOnly') ?? false;
+  }
+
+  set bgUpdatesOnWiFiOnly(bool val) {
+    prefs?.setBool('bgUpdatesOnWiFiOnly', val);
+    notifyListeners();
+  }
+
+  DateTime get lastBGCheckTime {
+    int? temp = prefs?.getInt('lastBGCheckTime');
+    return temp != null
+        ? DateTime.fromMillisecondsSinceEpoch(temp)
+        : DateTime.fromMillisecondsSinceEpoch(0);
+  }
+
+  set lastBGCheckTime(DateTime val) {
+    prefs?.setInt('lastBGCheckTime', val.millisecondsSinceEpoch);
+    notifyListeners();
+  }
+
+  bool get showDebugOpts {
+    return prefs?.getBool('showDebugOpts') ?? false;
+  }
+
+  set showDebugOpts(bool val) {
+    prefs?.setBool('showDebugOpts', val);
+    notifyListeners();
+  }
+
+  bool get highlightTouchTargets {
+    return prefs?.getBool('highlightTouchTargets') ?? false;
+  }
+
+  set highlightTouchTargets(bool val) {
+    prefs?.setBool('highlightTouchTargets', val);
+    notifyListeners();
+  }
+
+  Future<Uri?> getExportDir() async {
+    var uriString = prefs?.getString('exportDir');
+    if (uriString != null) {
+      Uri? uri = Uri.parse(uriString);
+      if (!(await saf.canRead(uri) ?? false) ||
+          !(await saf.canWrite(uri) ?? false)) {
+        uri = null;
+        prefs?.remove('exportDir');
+        notifyListeners();
+      }
+      return uri;
+    } else {
+      return null;
+    }
+  }
+
+  Future<void> pickExportDir({bool remove = false}) async {
+    var existingSAFPerms = (await saf.persistedUriPermissions()) ?? [];
+    var currentOneWayDataSyncDir = await getExportDir();
+    Uri? newOneWayDataSyncDir;
+    if (!remove) {
+      newOneWayDataSyncDir = (await saf.openDocumentTree());
+    }
+    if (currentOneWayDataSyncDir?.path != newOneWayDataSyncDir?.path) {
+      if (newOneWayDataSyncDir == null) {
+        prefs?.remove('exportDir');
+      } else {
+        prefs?.setString('exportDir', newOneWayDataSyncDir.toString());
+      }
+      notifyListeners();
+    }
+    for (var e in existingSAFPerms) {
+      await saf.releasePersistableUriPermission(e.uri);
+    }
+  }
+
+  bool get autoExportOnChanges {
+    return prefs?.getBool('autoExportOnChanges') ?? false;
+  }
+
+  set autoExportOnChanges(bool val) {
+    prefs?.setBool('autoExportOnChanges', val);
+    notifyListeners();
+  }
+
+  bool get onlyCheckInstalledOrTrackOnlyApps {
+    return prefs?.getBool('onlyCheckInstalledOrTrackOnlyApps') ?? false;
+  }
+
+  set onlyCheckInstalledOrTrackOnlyApps(bool val) {
+    prefs?.setBool('onlyCheckInstalledOrTrackOnlyApps', val);
+    notifyListeners();
+  }
 }

lib/providers/source_provider.dart

@@ -3,24 +3,36 @@
 
 import 'dart:convert';
 
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:html/dom.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/app_sources/apkmirror.dart';
+import 'package:obtainium/app_sources/apkpure.dart';
+import 'package:obtainium/app_sources/aptoide.dart';
 import 'package:obtainium/app_sources/codeberg.dart';
 import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/app_sources/fdroidrepo.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/app_sources/gitlab.dart';
+import 'package:obtainium/app_sources/huaweiappgallery.dart';
 import 'package:obtainium/app_sources/izzyondroid.dart';
 import 'package:obtainium/app_sources/html.dart';
+import 'package:obtainium/app_sources/jenkins.dart';
 import 'package:obtainium/app_sources/mullvad.dart';
+import 'package:obtainium/app_sources/neutroncode.dart';
 import 'package:obtainium/app_sources/signal.dart';
 import 'package:obtainium/app_sources/sourceforge.dart';
+import 'package:obtainium/app_sources/sourcehut.dart';
 import 'package:obtainium/app_sources/steammobile.dart';
+import 'package:obtainium/app_sources/telegramapp.dart';
+import 'package:obtainium/app_sources/uptodown.dart';
+import 'package:obtainium/app_sources/vlc.dart';
+import 'package:obtainium/app_sources/whatsapp.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
+import 'package:obtainium/providers/settings_provider.dart';
 
 class AppNames {
   late String author;
@@ -31,10 +43,113 @@ class AppNames {
 
 class APKDetails {
   late String version;
-  late List<String> apkUrls;
+  late List<MapEntry<String, String>> apkUrls;
   late AppNames names;
+  late DateTime? releaseDate;
+  late String? changeLog;
 
-  APKDetails(this.version, this.apkUrls, this.names);
+  APKDetails(this.version, this.apkUrls, this.names,
+      {this.releaseDate, this.changeLog});
+}
+
+stringMapListTo2DList(List<MapEntry<String, String>> mapList) =>
+    mapList.map((e) => [e.key, e.value]).toList();
+
+assumed2DlistToStringMapList(List<dynamic> arr) =>
+    arr.map((e) => MapEntry(e[0] as String, e[1] as String)).toList();
+
+// App JSON schema has changed multiple times over the many versions of Obtainium
+// This function takes an App JSON and modifies it if needed to conform to the latest (current) version
+appJSONCompatibilityModifiers(Map<String, dynamic> json) {
+  var source = SourceProvider()
+      .getSource(json['url'], overrideSource: json['overrideSource']);
+  var formItems = source.combinedAppSpecificSettingFormItems
+      .reduce((value, element) => [...value, ...element]);
+  Map<String, dynamic> additionalSettings =
+      getDefaultValuesFromFormItems([formItems]);
+  if (json['additionalSettings'] != null) {
+    additionalSettings.addEntries(
+        Map<String, dynamic>.from(jsonDecode(json['additionalSettings']))
+            .entries);
+  }
+  // If needed, migrate old-style additionalData to newer-style additionalSettings (V1)
+  if (json['additionalData'] != null) {
+    List<String> temp = List<String>.from(jsonDecode(json['additionalData']));
+    temp.asMap().forEach((i, value) {
+      if (i < formItems.length) {
+        if (formItems[i] is GeneratedFormSwitch) {
+          additionalSettings[formItems[i].key] = value == 'true';
+        } else {
+          additionalSettings[formItems[i].key] = value;
+        }
+      }
+    });
+    additionalSettings['trackOnly'] =
+        json['trackOnly'] == 'true' || json['trackOnly'] == true;
+    additionalSettings['noVersionDetection'] =
+        json['noVersionDetection'] == 'true' || json['trackOnly'] == true;
+  }
+  // Convert bool style version detection options to dropdown style
+  if (additionalSettings['noVersionDetection'] == true) {
+    additionalSettings['versionDetection'] = 'noVersionDetection';
+    if (additionalSettings['releaseDateAsVersion'] == true) {
+      additionalSettings['versionDetection'] = 'releaseDateAsVersion';
+      additionalSettings.remove('releaseDateAsVersion');
+    }
+    if (additionalSettings['noVersionDetection'] != null) {
+      additionalSettings.remove('noVersionDetection');
+    }
+    if (additionalSettings['releaseDateAsVersion'] != null) {
+      additionalSettings.remove('releaseDateAsVersion');
+    }
+  }
+  // Ensure additionalSettings are correctly typed
+  for (var item in formItems) {
+    if (additionalSettings[item.key] != null) {
+      additionalSettings[item.key] =
+          item.ensureType(additionalSettings[item.key]);
+    }
+  }
+  int preferredApkIndex =
+      json['preferredApkIndex'] == null ? 0 : json['preferredApkIndex'] as int;
+  if (preferredApkIndex < 0) {
+    preferredApkIndex = 0;
+  }
+  json['preferredApkIndex'] = preferredApkIndex;
+  // apkUrls can either be old list or new named list apkUrls
+  List<MapEntry<String, String>> apkUrls = [];
+  if (json['apkUrls'] != null) {
+    var apkUrlJson = jsonDecode(json['apkUrls']);
+    try {
+      apkUrls = getApkUrlsFromUrls(List<String>.from(apkUrlJson));
+    } catch (e) {
+      apkUrls = assumed2DlistToStringMapList(List<dynamic>.from(apkUrlJson));
+      apkUrls = List<dynamic>.from(apkUrlJson)
+          .map((e) => MapEntry(e[0] as String, e[1] as String))
+          .toList();
+    }
+    json['apkUrls'] = jsonEncode(stringMapListTo2DList(apkUrls));
+  }
+  // Arch based APK filter option should be disabled if it previously did not exist
+  if (additionalSettings['autoApkFilterByArch'] == null) {
+    additionalSettings['autoApkFilterByArch'] = false;
+  }
+  json['additionalSettings'] = jsonEncode(additionalSettings);
+  // F-Droid no longer needs cloudflare exception since override can be used - migrate apps appropriately
+  // This allows us to reverse the changes made for issue #418 (support cloudflare.f-droid)
+  // While not causing problems for existing apps from that source that were added in a previous version
+  var overrideSourceWasUndefined = !json.keys.contains('overrideSource');
+  if ((json['url'] as String).startsWith('https://cloudflare.f-droid.org')) {
+    json['overrideSource'] = FDroid().runtimeType.toString();
+  } else if (overrideSourceWasUndefined) {
+    // Similar to above, but for third-party F-Droid repos
+    RegExpMatch? match = RegExp('^https?://.+/fdroid/([^/]+(/|\\?)|[^/]+\$)')
+        .firstMatch(json['url'] as String);
+    if (match != null) {
+      json['overrideSource'] = FDroidRepo().runtimeType.toString();
+    }
+  }
+  return json;
 }
 
 class App {
@@ -44,12 +159,16 @@ class App {
   late String name;
   String? installedVersion;
   late String latestVersion;
-  List<String> apkUrls = [];
+  List<MapEntry<String, String>> apkUrls = [];
   late int preferredApkIndex;
   late Map<String, dynamic> additionalSettings;
   late DateTime? lastUpdateCheck;
   bool pinned = false;
   List<String> categories;
+  late DateTime? releaseDate;
+  late String? changeLog;
+  late String? overrideSource;
+  bool allowIdChange = false;
   App(
       this.id,
       this.url,
@@ -62,54 +181,46 @@ class App {
       this.additionalSettings,
       this.lastUpdateCheck,
       this.pinned,
-      {this.categories = const []});
+      {this.categories = const [],
+      this.releaseDate,
+      this.changeLog,
+      this.overrideSource,
+      this.allowIdChange = false});
 
   @override
   String toString() {
     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,
+      author,
+      name,
+      installedVersion,
+      latestVersion,
+      apkUrls,
+      preferredApkIndex,
+      Map.from(additionalSettings),
+      lastUpdateCheck,
+      pinned,
+      categories: categories,
+      changeLog: changeLog,
+      releaseDate: releaseDate,
+      overrideSource: overrideSource,
+      allowIdChange: allowIdChange);
+
   factory App.fromJson(Map<String, dynamic> json) {
-    var source = SourceProvider().getSource(json['url']);
-    var formItems = source.combinedAppSpecificSettingFormItems
-        .reduce((value, element) => [...value, ...element]);
-    Map<String, dynamic> additionalSettings =
-        getDefaultValuesFromFormItems([formItems]);
-    if (json['additionalSettings'] != null) {
-      additionalSettings.addEntries(
-          Map<String, dynamic>.from(jsonDecode(json['additionalSettings']))
-              .entries);
-    }
-    // If needed, migrate old-style additionalData to newer-style additionalSettings (V1)
-    if (json['additionalData'] != null) {
-      List<String> temp = List<String>.from(jsonDecode(json['additionalData']));
-      temp.asMap().forEach((i, value) {
-        if (i < formItems.length) {
-          if (formItems[i] is GeneratedFormSwitch) {
-            additionalSettings[formItems[i].key] = value == 'true';
-          } else {
-            additionalSettings[formItems[i].key] = value;
-          }
-        }
-      });
-      additionalSettings['trackOnly'] =
-          json['trackOnly'] == 'true' || json['trackOnly'] == true;
-      additionalSettings['noVersionDetection'] =
-          json['noVersionDetection'] == 'true' || json['trackOnly'] == true;
-    }
-    // Ensure additionalSettings are correctly typed
-    for (var item in formItems) {
-      if (additionalSettings[item.key] != null) {
-        additionalSettings[item.key] =
-            item.ensureType(additionalSettings[item.key]);
-      }
-    }
-    int preferredApkIndex = json['preferredApkIndex'] == null
-        ? 0
-        : json['preferredApkIndex'] as int;
-    if (preferredApkIndex < 0) {
-      preferredApkIndex = 0;
-    }
+    json = appJSONCompatibilityModifiers(json);
     return App(
         json['id'] as String,
         json['url'] as String,
@@ -119,11 +230,9 @@ class App {
             ? null
             : json['installedVersion'] as String,
         json['latestVersion'] as String,
-        json['apkUrls'] == null
-            ? []
-            : List<String>.from(jsonDecode(json['apkUrls'])),
-        preferredApkIndex,
-        additionalSettings,
+        assumed2DlistToStringMapList(jsonDecode(json['apkUrls'])),
+        json['preferredApkIndex'] as int,
+        jsonDecode(json['additionalSettings']) as Map<String, dynamic>,
         json['lastUpdateCheck'] == null
             ? null
             : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
@@ -134,7 +243,14 @@ class App {
                 .toList()
             : json['category'] != null
                 ? [json['category'] as String]
-                : []);
+                : [],
+        releaseDate: json['releaseDate'] == null
+            ? null
+            : DateTime.fromMicrosecondsSinceEpoch(json['releaseDate']),
+        changeLog:
+            json['changeLog'] == null ? null : json['changeLog'] as String,
+        overrideSource: json['overrideSource'],
+        allowIdChange: json['allowIdChange'] ?? false);
   }
 
   Map<String, dynamic> toJson() => {
@@ -144,12 +260,16 @@ class App {
         'name': name,
         'installedVersion': installedVersion,
         'latestVersion': latestVersion,
-        'apkUrls': jsonEncode(apkUrls),
+        'apkUrls': jsonEncode(stringMapListTo2DList(apkUrls)),
         'preferredApkIndex': preferredApkIndex,
         'additionalSettings': jsonEncode(additionalSettings),
         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
         'pinned': pinned,
-        'categories': categories
+        'categories': categories,
+        'releaseDate': releaseDate?.microsecondsSinceEpoch,
+        'changeLog': changeLog,
+        'overrideSource': overrideSource,
+        'allowIdChange': allowIdChange
       };
 }
 
@@ -163,9 +283,6 @@ preStandardizeUrl(String url) {
       url.toLowerCase().indexOf('https://') != 0) {
     url = 'https://$url';
   }
-  if (url.toLowerCase().indexOf('https://www.') == 0) {
-    url = 'https://${url.substring(12)}';
-  }
   url = url
       .split('/')
       .where((e) => e.isNotEmpty)
@@ -194,16 +311,88 @@ Map<String, dynamic> getDefaultValuesFromFormItems(
       .reduce((value, element) => [...value, ...element]));
 }
 
-class AppSource {
+List<MapEntry<String, String>> getApkUrlsFromUrls(List<String> urls) =>
+    urls.map((e) {
+      var segments = e.split('/').where((el) => el.trim().isNotEmpty);
+      var apkSegs = segments.where((s) => s.toLowerCase().endsWith('.apk'));
+      return MapEntry(apkSegs.isNotEmpty ? apkSegs.last : segments.last, e);
+    }).toList();
+
+abstract class AppSource {
   String? host;
+  bool hostChanged = false;
   late String name;
   bool enforceTrackOnly = false;
+  bool changeLogIfAnyIsMarkDown = true;
+  bool appIdInferIsOptional = false;
+  bool allowSubDomains = false;
+  bool naiveStandardVersionDetection = false;
+  bool neverAutoSelect = false;
 
   AppSource() {
     name = runtimeType.toString();
   }
 
-  String standardizeURL(String url) {
+  overrideVersionDetectionFormDefault(String vd,
+      {bool disableStandard = false, bool disableRelDate = false}) {
+    additionalAppSpecificSourceAgnosticSettingFormItems =
+        additionalAppSpecificSourceAgnosticSettingFormItems.map((e) {
+      return e.map((e2) {
+        if (e2.key == 'versionDetection') {
+          var item = e2 as GeneratedFormDropdown;
+          item.defaultValue = vd;
+          item.disabledOptKeys = [];
+          if (disableStandard) {
+            item.disabledOptKeys?.add('standardVersionDetection');
+          }
+          if (disableRelDate) {
+            item.disabledOptKeys?.add('releaseDateAsVersion');
+          }
+          item.disabledOptKeys =
+              item.disabledOptKeys?.where((element) => element != vd).toList();
+        }
+        return e2;
+      }).toList();
+    }).toList();
+  }
+
+  String standardizeUrl(String url) {
+    url = preStandardizeUrl(url);
+    if (!hostChanged) {
+      url = sourceSpecificStandardizeURL(url);
+    }
+    return url;
+  }
+
+  Future<Map<String, String>?> getRequestHeaders(
+      {Map<String, dynamic> additionalSettings = const <String, dynamic>{},
+      bool forAPKDownload = false}) async {
+    return null;
+  }
+
+  App endOfGetAppChanges(App app) {
+    return app;
+  }
+
+  Future<Response> sourceRequest(String url,
+      {bool followRedirects = true,
+      Map<String, dynamic> additionalSettings =
+          const <String, dynamic>{}}) async {
+    var requestHeaders =
+        await getRequestHeaders(additionalSettings: additionalSettings);
+    if (requestHeaders != null || followRedirects == false) {
+      var req = Request('GET', Uri.parse(url));
+      req.followRedirects = followRedirects;
+      if (requestHeaders != null) {
+        req.headers.addAll(requestHeaders);
+      }
+      return Response.fromStream(await Client().send(req));
+    } else {
+      return get(Uri.parse(url));
+    }
+  }
+
+  String sourceSpecificStandardizeURL(String url) {
     throw NotImplementedError();
   }
 
@@ -217,7 +406,7 @@ class AppSource {
       [];
 
   // Some additional data may be needed for Apps regardless of Source
-  final List<List<GeneratedFormItem>>
+  List<List<GeneratedFormItem>>
       additionalAppSpecificSourceAgnosticSettingFormItems = [
     [
       GeneratedFormSwitch(
@@ -225,7 +414,41 @@ class AppSource {
         label: tr('trackOnly'),
       )
     ],
-    [GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))]
+    [
+      GeneratedFormDropdown(
+          'versionDetection',
+          [
+            MapEntry(
+                'standardVersionDetection', tr('standardVersionDetection')),
+            MapEntry('releaseDateAsVersion', tr('releaseDateAsVersion')),
+            MapEntry('noVersionDetection', tr('noVersionDetection'))
+          ],
+          label: tr('versionDetection'),
+          defaultValue: 'standardVersionDetection')
+    ],
+    [
+      GeneratedFormTextField('apkFilterRegEx',
+          label: tr('filterAPKsByRegEx'),
+          required: false,
+          additionalValidators: [
+            (value) {
+              return regExValidator(value);
+            }
+          ])
+    ],
+    [
+      GeneratedFormSwitch('autoApkFilterByArch',
+          label: tr('autoApkFilterByArch'), defaultValue: true)
+    ],
+    [GeneratedFormTextField('appName', label: tr('appName'), required: false)],
+    [
+      GeneratedFormSwitch('exemptFromBackgroundUpdates',
+          label: tr('exemptFromBackgroundUpdates'))
+    ],
+    [
+      GeneratedFormSwitch('skipUpdateNotifications',
+          label: tr('skipUpdateNotifications'))
+    ]
   ];
 
   // Previous 2 variables combined into one at runtime for convenient usage
@@ -237,71 +460,153 @@ class AppSource {
   }
 
   // Some Sources may have additional settings at the Source level (not specific to Apps) - these use SettingsProvider
-  List<GeneratedFormItem> additionalSourceSpecificSettingFormItems = [];
+  // If the source has been overridden, we expect the user to define one-time values as additional settings - don't use the stored values
+  List<GeneratedFormItem> sourceConfigSettingFormItems = [];
+  Future<Map<String, String>> getSourceConfigValues(
+      Map<String, dynamic> additionalSettings,
+      SettingsProvider settingsProvider) async {
+    Map<String, String> results = {};
+    for (var e in sourceConfigSettingFormItems) {
+      var val = hostChanged
+          ? additionalSettings[e.key]
+          : settingsProvider.getSettingString(e.key);
+      if (val != null) {
+        results[e.key] = val;
+      }
+    }
+    return results;
+  }
 
   String? changeLogPageFromStandardUrl(String standardUrl) {
     return null;
   }
 
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async {
+  Future<String?> getSourceNote() async {
+    return null;
+  }
+
+  Future<String> apkUrlPrefetchModifier(
+      String apkUrl, String standardUrl) async {
     return apkUrl;
   }
 
   bool canSearch = false;
-  Future<Map<String, String>> search(String query) {
+  bool excludeFromMassSearch = false;
+  List<GeneratedFormItem> searchQuerySettingFormItems = [];
+  Future<Map<String, List<String>>> search(String query,
+      {Map<String, dynamic> querySettings = const {}}) {
     throw NotImplementedError();
   }
 
-  String? tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) {
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
     return null;
   }
 }
 
 ObtainiumError getObtainiumHttpError(Response res) {
-  return ObtainiumError(res.reasonPhrase ??
-      tr('errorWithHttpStatusCode', args: [res.statusCode.toString()]));
+  return ObtainiumError((res.reasonPhrase != null &&
+          res.reasonPhrase != null &&
+          res.reasonPhrase!.isNotEmpty)
+      ? res.reasonPhrase!
+      : tr('errorWithHttpStatusCode', args: [res.statusCode.toString()]));
 }
 
 abstract class MassAppUrlSource {
   late String name;
   late List<String> requiredArgs;
-  Future<Map<String, String>> getUrlsWithDescriptions(List<String> args);
+  Future<Map<String, List<String>>> getUrlsWithDescriptions(List<String> args);
+}
+
+regExValidator(String? value) {
+  if (value == null || value.isEmpty) {
+    return null;
+  }
+  try {
+    RegExp(value);
+  } catch (e) {
+    return tr('invalidRegEx');
+  }
+  return null;
+}
+
+intValidator(String? value, {bool positive = false}) {
+  if (value == null) {
+    return tr('invalidInput');
+  }
+  var num = int.tryParse(value);
+  if (num == null) {
+    return tr('invalidInput');
+  }
+  if (positive && num <= 0) {
+    return tr('invalidInput');
+  }
+  return null;
+}
+
+bool isTempId(App app) {
+  // return app.id == generateTempID(app.url, app.additionalSettings);
+  return RegExp('^[0-9]+\$').hasMatch(app.id);
 }
 
 class SourceProvider {
   // Add more source classes here so they are available via the service
-  List<AppSource> sources = [
-    GitHub(),
-    GitLab(),
-    Codeberg(),
-    FDroid(),
-    IzzyOnDroid(),
-    Mullvad(),
-    Signal(),
-    SourceForge(),
-    APKMirror(),
-    FDroidRepo(),
-    SteamMobile(),
-    HTML() // This should ALWAYS be the last option as they are tried in order
-  ];
+  List<AppSource> get sources => [
+        GitHub(),
+        GitLab(),
+        Codeberg(),
+        FDroid(),
+        FDroidRepo(),
+        IzzyOnDroid(),
+        SourceForge(),
+        SourceHut(),
+        APKPure(),
+        Aptoide(),
+        Uptodown(),
+        APKMirror(),
+        HuaweiAppGallery(),
+        Jenkins(),
+        // APKCombo(), // Can't get past their scraping blocking yet (get 403 Forbidden)
+        Mullvad(),
+        Signal(),
+        VLC(),
+        WhatsApp(), // As of 2023-03-20 this is unusable as the version on the webpage is months out of date
+        TelegramApp(),
+        SteamMobile(),
+        NeutronCode(),
+        HTML() // This should ALWAYS be the last option as they are tried in order
+      ];
 
   // Add more mass url source classes here so they are available via the service
   List<MassAppUrlSource> massUrlSources = [GitHubStars()];
 
-  AppSource getSource(String url) {
+  AppSource getSource(String url, {String? overrideSource}) {
     url = preStandardizeUrl(url);
+    if (overrideSource != null) {
+      var srcs =
+          sources.where((e) => e.runtimeType.toString() == overrideSource);
+      if (srcs.isEmpty) {
+        throw UnsupportedURLError();
+      }
+      var res = srcs.first;
+      res.host = Uri.parse(url).host;
+      res.hostChanged = true;
+      return srcs.first;
+    }
     AppSource? source;
     for (var s in sources.where((element) => element.host != null)) {
-      if (url.contains('://${s.host}')) {
+      if (RegExp(
+              '://(${s.allowSubDomains ? '([^\\.]+\\.)*' : ''}|www\\.)${s.host}(/|\\z)?')
+          .hasMatch(url)) {
         source = s;
         break;
       }
     }
     if (source == null) {
-      for (var s in sources.where((element) => element.host == null)) {
+      for (var s in sources.where(
+          (element) => element.host == null && !element.neverAutoSelect)) {
         try {
-          s.standardizeURL(url);
+          s.sourceSpecificStandardizeURL(url);
           source = s;
           break;
         } catch (e) {
@@ -326,71 +631,89 @@ class SourceProvider {
     return false;
   }
 
-  String generateTempID(AppNames names, AppSource source) =>
-      '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}';
-
-  bool isTempId(String id) {
-    List<String> parts = id.split('_');
-    if (parts.length < 3) {
-      return false;
-    }
-    for (int i = 0; i < parts.length - 1; i++) {
-      if (RegExp('.*[A-Z].*').hasMatch(parts[i])) {
-        // TODO: Look into RegEx for non-Latin characters
-        return false;
-      }
-    }
-    return true;
-  }
+  String generateTempID(
+          String standardUrl, Map<String, dynamic> additionalSettings) =>
+      (standardUrl + additionalSettings.toString()).hashCode.toString();
 
   Future<App> getApp(
       AppSource source, String url, Map<String, dynamic> additionalSettings,
       {App? currentApp,
       bool trackOnlyOverride = false,
-      noVersionDetectionOverride = false}) async {
+      String? overrideSource,
+      bool inferAppIdIfOptional = false}) async {
     if (trackOnlyOverride || source.enforceTrackOnly) {
       additionalSettings['trackOnly'] = true;
     }
-    if (noVersionDetectionOverride) {
-      additionalSettings['noVersionDetection'] = true;
-    }
     var trackOnly = additionalSettings['trackOnly'] == true;
-    String standardUrl = source.standardizeURL(preStandardizeUrl(url));
+    String standardUrl = source.standardizeUrl(url);
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalSettings);
+    if (additionalSettings['versionDetection'] == 'releaseDateAsVersion' &&
+        apk.releaseDate != null) {
+      apk.version = apk.releaseDate!.microsecondsSinceEpoch.toString();
+    }
+    if (additionalSettings['apkFilterRegEx'] != null) {
+      var reg = RegExp(additionalSettings['apkFilterRegEx']);
+      apk.apkUrls =
+          apk.apkUrls.where((element) => reg.hasMatch(element.key)).toList();
+    }
     if (apk.apkUrls.isEmpty && !trackOnly) {
       throw NoAPKError();
     }
-    String apkVersion = apk.version.replaceAll('/', '-');
-    var name = currentApp?.name.trim() ??
-        apk.names.name[0].toUpperCase() + apk.names.name.substring(1);
-    return App(
+    if (apk.apkUrls.length > 1 &&
+        additionalSettings['autoApkFilterByArch'] == true) {
+      var abis = (await DeviceInfoPlugin().androidInfo).supportedAbis;
+      for (var abi in abis) {
+        var urls2 = apk.apkUrls
+            .where((element) => RegExp('.*$abi.*').hasMatch(element.key))
+            .toList();
+        if (urls2.isNotEmpty && urls2.length < apk.apkUrls.length) {
+          apk.apkUrls = urls2;
+          break;
+        }
+      }
+    }
+    var name = currentApp != null ? currentApp.name.trim() : '';
+    name = name.isNotEmpty ? name : apk.names.name;
+    App finalApp = App(
         currentApp?.id ??
-            source.tryInferringAppId(standardUrl,
-                additionalSettings: additionalSettings) ??
-            generateTempID(apk.names, source),
+            ((!source.appIdInferIsOptional ||
+                    (source.appIdInferIsOptional && inferAppIdIfOptional))
+                ? await source.tryInferringAppId(standardUrl,
+                    additionalSettings: additionalSettings)
+                : null) ??
+            generateTempID(standardUrl, additionalSettings),
         standardUrl,
-        apk.names.author[0].toUpperCase() + apk.names.author.substring(1),
-        name.trim().isNotEmpty
-            ? name
-            : apk.names.name[0].toUpperCase() + apk.names.name.substring(1),
+        apk.names.author,
+        name,
         currentApp?.installedVersion,
-        apkVersion,
+        apk.version,
         apk.apkUrls,
         apk.apkUrls.length - 1 >= 0 ? apk.apkUrls.length - 1 : 0,
         additionalSettings,
         DateTime.now(),
         currentApp?.pinned ?? false,
-        categories: currentApp?.categories ?? const []);
+        categories: currentApp?.categories ?? const [],
+        releaseDate: apk.releaseDate,
+        changeLog: apk.changeLog,
+        overrideSource: overrideSource ?? currentApp?.overrideSource,
+        allowIdChange: currentApp?.allowIdChange ??
+            source.appIdInferIsOptional &&
+                inferAppIdIfOptional // Optional ID inferring may be incorrect - allow correction on first install
+        );
+    return source.endOfGetAppChanges(finalApp);
   }
 
   // Returns errors in [results, errors] instead of throwing them
   Future<List<dynamic>> getAppsByURLNaive(List<String> urls,
-      {List<String> ignoreUrls = const []}) async {
+      {List<String> alreadyAddedUrls = const []}) async {
     List<App> apps = [];
     Map<String, dynamic> 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,