Merge pull request #487 from ImranR98/dev

Fixed null error for imported Apps (#476)

README.md

@@ -19,6 +19,8 @@ Currently supported App sources:
 - Third Party F-Droid Repos
   - Any URLs ending with `/fdroid/<word>`, where `<word>` can be anything - most often `repo`
 - [Steam](https://store.steampowered.com/mobile)
+- [Telegram App](https://telegram.org)
+- [VLC](https://www.videolan.org/vlc/download-android.html)
 - [Neutron Code](https://neutroncode.com)
 - "HTML" (Fallback)
   - Any other URL that returns an HTML page with links to APK files (if multiple, the last file alphabetically is picked)

assets/ca/lets-encrypt-r3.pem

@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
+WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
+R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
+sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
+NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
+Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
+/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
+FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
+AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
+Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
+gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
+PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
+ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
+CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
+lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
+avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
+yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
+yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
+hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
+HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
+MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
+nLRbwHOoq7hHwg==
+-----END CERTIFICATE-----

assets/translations/de.json

@@ -122,6 +122,7 @@
     "followSystem": "System folgen",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "App sortieren nach",
     "authorName": "Autor/Name",
     "nameAuthor": "Name/Autor",
@@ -207,6 +208,7 @@
     "addCategory": "Kategorie hinzufügen",
     "label": "Bezeichnung",
     "language": "Sprache",
+    "copiedToClipboard": "Copied to Clipboard",
     "storagePermissionDenied": "Speicherberechtigung verweigert",
     "selectedCategorizeWarning": "Dadurch werden alle bestehenden Kategorieeinstellungen für die ausgewählten Apps ersetzt.",
     "filterAPKsByRegEx": "APKs nach regulärem Ausdruck filtern",
@@ -220,9 +222,11 @@
     "importFromURLsInFile": "Importieren von URLs aus Datei ( z.B. OPML)",
     "versionDetection": "Versionserkennung",
     "standardVersionDetection": "Standardversionserkennung",
+    "groupByCategory": "Nach Kategorie gruppieren",
+    "autoApkFilterByArch": "Nach Möglichkeit versuchen, APKs nach CPU-Architektur zu filtern",
     "removeAppQuestion": {
         "one": "App entfernen?",
-        "other": "App entfernen?"
+        "other": "Apps entfernen?"
     },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut",

assets/translations/en.json

@@ -122,6 +122,7 @@
     "followSystem": "Follow System",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "App Sort By",
     "authorName": "Author/Name",
     "nameAuthor": "Name/Author",
@@ -207,6 +208,7 @@
     "addCategory": "Add Category",
     "label": "Label",
     "language": "Language",
+    "copiedToClipboard": "Copied to Clipboard",
     "storagePermissionDenied": "Storage permission denied",
     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
     "filterAPKsByRegEx": "Filter APKs by Regular Expression",
@@ -220,6 +222,8 @@
     "importFromURLsInFile": "Import from URLs in File (like OPML)",
     "versionDetection": "Version Detection",
     "standardVersionDetection": "Standard version detection",
+    "groupByCategory": "Group by Category",
+    "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/fa.json

@@ -122,6 +122,7 @@
     "followSystem": "هماهنگ با سیستم",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "مرتب سازی برنامه بر اساس",
     "authorName": "سازنده/اسم",
     "nameAuthor": "اسم/سازنده",
@@ -207,6 +208,7 @@
     "addCategory": "اضافه کردن دسته",
     "label": "برچسب",
     "language": "زبان",
+    "copiedToClipboard": "در کلیپ بورد کپی شد",
     "storagePermissionDenied": "مجوز ذخیره سازی رد شد",
     "selectedCategorizeWarning": "این جایگزین تنظیمات دسته بندی موجود برای برنامه های انتخابی می شود.",
     "filterAPKsByRegEx": "فایل‌های APK را با نظم فیلتر کنید",
@@ -220,6 +222,8 @@
     "importFromURLsInFile": "وارد کردن از آدرس های اینترنتی موجود در فایل (مانند OPML)",
     "versionDetection": "تشخیص نسخه",
     "standardVersionDetection": "تشخیص نسخه استاندارد",
+    "groupByCategory": "گروه بر اساس دسته",
+    "autoApkFilterByArch": "در صورت امکان سعی کنید APKها را بر اساس معماری CPU فیلتر کنید",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -122,6 +122,7 @@
     "followSystem": "Suivre le système",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "Applications triées par",
     "authorName": "Auteur/Nom",
     "nameAuthor": "Nom/Auteur",
@@ -207,6 +208,7 @@
     "addCategory": "Ajouter une catégorie",
     "label": "Étiquette",
     "language": "Langue",
+    "copiedToClipboard": "Copied to Clipboard",
     "storagePermissionDenied": "Autorisation de stockage refusée",
     "selectedCategorizeWarning": "Cela remplacera tous les paramètres de catégorie existants pour les applications sélectionnées.",
     "filterAPKsByRegEx": "Filtrer les APK par expression régulière",
@@ -220,6 +222,8 @@
     "importFromURLsInFile": "Importer à partir d'URL dans un fichier (comme OPML)",
     "versionDetection": "Détection des versions",
     "standardVersionDetection": "Détection de version standard",
+    "groupByCategory": "Group by Category",
+    "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"

assets/translations/hu.json

@@ -122,6 +122,7 @@
     "followSystem": "Rendszer szerint",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "App rendezés...",
     "authorName": "Szerző/Név",
     "nameAuthor": "Név/Szerző",
@@ -206,6 +207,7 @@
     "addCategory": "Új kategória",
     "label": "Címke",
     "language": "Nyelv",
+    "copiedToClipboard": "Copied to Clipboard",
     "storagePermissionDenied": "Tárhely engedély megtagadva",
     "selectedCategorizeWarning": "Ez felváltja a kiválasztott alkalmazások meglévő kategória-beállításait.",
     "filterAPKsByRegEx": "Az APK-k szűrése reguláris kifejezéssel",
@@ -219,6 +221,8 @@
     "importFromURLsInFile": "Importálás fájlban található URL-ből (mint pl. OPML)",
     "versionDetection": "Verzió érzékelés",
     "standardVersionDetection": "Alapért. verzió érzékelés",
+    "groupByCategory": "Csoportosítás Kategória alapján",
+    "autoApkFilterByArch": "Ha lehetséges, próbálja CPU architektúra szerint szűrni az APK-kat",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -122,6 +122,7 @@
     "followSystem": "Segui sistema",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "App ordinate per",
     "authorName": "Autore/Nome",
     "nameAuthor": "Nome/Autore",
@@ -207,6 +208,7 @@
     "addCategory": "Aggiungi categoria",
     "label": "Etichetta",
     "language": "Lingua",
+    "copiedToClipboard": "Copiato negli appunti",
     "storagePermissionDenied": "Accesso ai file non autorizzato",
     "selectedCategorizeWarning": "Ciò sostituirà le impostazioni di categoria esistenti per le App selezionate.",
     "filterAPKsByRegEx": "Filtra file APK con espressioni regolari",
@@ -217,9 +219,11 @@
     "releaseDateAsVersionExplanation": "Questa opzione dovrebbe essere usata solo per le App in cui il rilevamento della versione non funziona correttamente, ma è disponibile una data di rilascio.",
     "changes": "Novità",
     "releaseDate": "Data di rilascio",
-    "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "importFromURLsInFile": "Importa da URL in file (come OPML)",
-    "versionDetection": "Version Detection",
+    "versionDetection": "Rilevamento di versione",
-    "standardVersionDetection": "Standard version detection",
+    "standardVersionDetection": "Rilevamento di versione standard",
+    "groupByCategory": "Raggruppa per categoria",
+    "autoApkFilterByArch": "Tenta di filtrare gli APK in base all'architettura della CPU, se possibile",
     "removeAppQuestion": {
         "one": "Rimuovere l'App?",
         "other": "Rimuovere le App?"

assets/translations/ja.json

@@ -122,6 +122,7 @@
     "followSystem": "システムに従う",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "アプリの並び方",
     "authorName": "作者名/アプリ名",
     "nameAuthor": "アプリ名/作者名",
@@ -207,6 +208,7 @@
     "addCategory": "カテゴリを追加",
     "label": "ラベル",
     "language": "言語",
+    "copiedToClipboard": "クリップボードにコピーしました",
     "storagePermissionDenied": "ストレージ権限が拒否されました",
     "selectedCategorizeWarning": "これにより、選択したアプリの既存のカテゴリ設定がすべて置き換えられます。",
     "filterAPKsByRegEx": "正規表現でAPKを絞り込む",
@@ -220,6 +222,8 @@
     "importFromURLsInFile": "ファイル（OPMLなど）内のURLからインポート",
     "versionDetection": "バージョン検出",
     "standardVersionDetection": "標準のバージョン検出",
+    "groupByCategory": "カテゴリ別にグループ化する",
+    "autoApkFilterByArch": "可能であれば，CPUアーキテクチャによるAPKのフィルタリングを試みる",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/zh.json

@@ -123,6 +123,7 @@
     "followSystem": "跟随系统",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "排列方式",
     "authorName": "作者 / 名字",
     "nameAuthor": "名字 / 作者",
@@ -208,6 +209,7 @@
     "addCategory": "添加类别",
     "label": "标签",
     "language": "语言",
+    "copiedToClipboard": "Copied to Clipboard",
     "storagePermissionDenied": "存储权限已被拒绝",
     "selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
     "filterAPKsByRegEx": "Filter APKs by Regular Expression",
@@ -220,6 +222,8 @@
     "importFromURLsInFile": "Import from URLs in File (like OPML)",
     "versionDetection": "Version Detection",
     "standardVersionDetection": "Standard version detection",
+    "groupByCategory": "Group by Category",
+    "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
     "removeAppQuestion": {
         "one": "删除应用？",
         "other": "删除应用？"

lib/app_sources/codeberg.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -35,6 +36,8 @@ class Codeberg extends AppSource {
     canSearch = true;
   }
 
+  var gh = GitHub();
+
   @override
   String standardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
@@ -54,76 +57,10 @@ class Codeberg extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    bool includePrereleases = additionalSettings['includePrereleases'] == true;
+    return gh.getLatestAPKDetailsCommon(
-    bool fallbackToOlderReleases =
+        'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100',
-        additionalSettings['fallbackToOlderReleases'] == true;
+        standardUrl,
-    String? regexFilter =
+        additionalSettings);
-        (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?per_page=100'));
-    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'];
-      DateTime? releaseDate = targetRelease['published_at'] != null
-          ? DateTime.parse(targetRelease['published_at'])
-          : null;
-      if (version == null) {
-        throw NoVersionError();
-      }
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
-          getAppNames(standardUrl),
-          releaseDate: releaseDate);
-    } else {
-      throw getObtainiumHttpError(res);
-    }
   }
 
   AppNames getAppNames(String standardUrl) {
@@ -134,20 +71,9 @@ class Codeberg extends AppSource {
 
   @override
   Future<Map<String, String>> search(String query) async {
-    Response res = await get(Uri.parse(
+    return gh.searchCommon(
-        'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100'));
+        query,
-    if (res.statusCode == 200) {
+        'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100',
-      Map<String, String> urlsWithDescriptions = {};
+        'data');
-      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);
-    }
   }
 }

lib/app_sources/fdroid.dart

@@ -14,12 +14,14 @@ class FDroid extends AppSource {
   @override
   String standardizeURL(String url) {
     RegExp standardUrlRegExB =
-        RegExp('^https?://$host/+[^/]+/+packages/+[^/]+');
+        RegExp('^https?://(cloudflare\\.)?$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/+[^/]+');
+    RegExp standardUrlRegExA =
+        RegExp('^https?://(cloudflare\\.)?$host/+packages/+[^/]+');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
@@ -27,9 +29,6 @@ class FDroid extends AppSource {
     return url.substring(0, match.end);
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   String? tryInferringAppId(String standardUrl,
       {Map<String, dynamic> additionalSettings = const {}}) {
@@ -51,7 +50,7 @@ class FDroid extends AppSource {
           .where((element) => element['versionName'] == latestVersion)
           .map((e) => '${apkUrlPrefix}_${e['versionCode']}.apk')
           .toList();
-      return APKDetails(latestVersion, apkUrls,
+      return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),
           AppNames(name, Uri.parse(standardUrl).pathSegments.last));
     } else {
       throw getObtainiumHttpError(res);
@@ -64,9 +63,10 @@ class FDroid extends AppSource {
     Map<String, dynamic> additionalSettings,
   ) async {
     String? appId = tryInferringAppId(standardUrl);
+    String host = Uri.parse(standardUrl).host;
     return getAPKUrlsFromFDroidPackagesAPIResponse(
-        await get(Uri.parse('https://f-droid.org/api/v1/packages/$appId')),
+        await get(Uri.parse('https://$host/api/v1/packages/$appId')),
-        'https://f-droid.org/repo/$appId',
+        'https://$host/repo/$appId',
         standardUrl);
   }
 }

lib/app_sources/fdroidrepo.dart

@@ -80,7 +80,8 @@ class FDroidRepo extends AppSource {
               element.querySelector('apkname') != null)
           .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

@@ -96,11 +96,9 @@ class GitHub extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       '$standardUrl/releases';
 
-  @override
+  Future<APKDetails> getLatestAPKDetailsCommon(String requestUrl,
-  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, Map<String, dynamic> additionalSettings,
-    String standardUrl,
+      {Function(Response)? onHttpErrorCode}) async {
-    Map<String, dynamic> additionalSettings,
-  ) async {
     bool includePrereleases = additionalSettings['includePrereleases'] == true;
     bool fallbackToOlderReleases =
         additionalSettings['fallbackToOlderReleases'] == true;
@@ -110,27 +108,50 @@ class GitHub extends AppSource {
                 true
             ? additionalSettings['filterReleaseTitlesByRegEx']
             : null;
-    Response res = await get(Uri.parse(
+    Response res = await get(Uri.parse(requestUrl));
-        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100'));
     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
+                return e['name'] != null && e['browser_download_url'] != null
-                    ? e['browser_download_url'] as String
+                    ? MapEntry(e['name'] as String,
-                    : '';
+                        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;
+      releases.sort((a, b) {
+        // See #478
+        if (a == b) {
+          return 0;
+        } else if (a == null) {
+          return -1;
+        } else if (b == null) {
+          return 1;
+        } else {
+          return getReleaseDateFromRelease(a)!
+              .compareTo(getReleaseDateFromRelease(b)!);
+        }
+      });
+      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?;
@@ -154,47 +175,78 @@ class GitHub extends AppSource {
         throw NoReleasesError();
       }
       String? version = targetRelease['tag_name'];
-      DateTime? releaseDate = targetRelease['published_at'] != null
+      DateTime? releaseDate = getReleaseDateFromRelease(targetRelease);
-          ? DateTime.parse(targetRelease['published_at'])
-          : null;
       if (version == null) {
         throw NoVersionError();
       }
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
+      var changeLog = targetRelease['body'].toString();
+      return APKDetails(
+          version,
+          targetRelease['apkUrls'] as List<MapEntry<String, String>>,
           getAppNames(standardUrl),
-          releaseDate: releaseDate);
+          releaseDate: releaseDate,
+          changeLog: changeLog.isEmpty ? null : changeLog);
     } else {
-      rateLimitErrorCheck(res);
+      if (onHttpErrorCode != null) {
+        onHttpErrorCode(res);
+      }
       throw getObtainiumHttpError(res);
     }
   }
 
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    return getLatestAPKDetailsCommon(
+        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100',
+        standardUrl,
+        additionalSettings, onHttpErrorCode: (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>> searchCommon(
-  Future<Map<String, String>> search(String query) async {
+      String query, String requestUrl, String rootProp,
-    Response res = await get(Uri.parse(
+      {Function(Response)? onHttpErrorCode}) async {
-        'https://${await getCredentialPrefixIfAny()}api.$host/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100'));
+    Response res = await get(Uri.parse(requestUrl));
     if (res.statusCode == 200) {
       Map<String, String> urlsWithDescriptions = {};
-      for (var e in (jsonDecode(res.body)['items'] as List<dynamic>)) {
+      for (var e in (jsonDecode(res.body)[rootProp] as List<dynamic>)) {
         urlsWithDescriptions.addAll({
-          e['html_url'] as String: e['description'] != null
+          e['html_url'] as String:
+              ((e['archived'] == true ? '[ARCHIVED] ' : '') +
+                  (e['description'] != null
                       ? e['description'] as String
-              : tr('noDescription')
+                      : tr('noDescription')))
         });
       }
       return urlsWithDescriptions;
     } else {
-      rateLimitErrorCheck(res);
+      if (onHttpErrorCode != null) {
+        onHttpErrorCode(res);
+      }
       throw getObtainiumHttpError(res);
     }
   }
 
+  @override
+  Future<Map<String, String>> search(String query) async {
+    return searchCommon(
+        query,
+        'https://${await getCredentialPrefixIfAny()}api.$host/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100',
+        'items', onHttpErrorCode: (Response res) {
+      rateLimitErrorCheck(res);
+    });
+  }
+
   rateLimitErrorCheck(Response res) {
     if (res.headers['x-ratelimit-remaining'] == '0') {
       throw RateLimitError(

lib/app_sources/gitlab.dart

@@ -3,10 +3,19 @@ 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';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:easy_localization/easy_localization.dart';
 
 class GitLab extends AppSource {
   GitLab() {
     host = 'gitlab.com';
+
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ]
+    ];
   }
 
   @override
@@ -28,13 +37,15 @@ class GitLab extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
+    bool fallbackToOlderReleases =
+        additionalSettings['fallbackToOlderReleases'] == true;
     Response res = await get(Uri.parse('$standardUrl/-/tags?format=atom'));
     if (res.statusCode == 200) {
       var standardUri = Uri.parse(standardUrl);
       var parsedHtml = parse(res.body);
-      var entry = parsedHtml.querySelector('entry');
+      var apkDetailsList = parsedHtml.querySelectorAll('entry').map((entry) {
-      var entryContent =
+        var entryContent = parse(
-          parse(parseFragment(entry?.querySelector('content')!.innerHtml).text);
+            parseFragment(entry.querySelector('content')!.innerHtml).text);
         var apkUrls = [
           ...getLinksFromParsedHTML(
               entryContent,
@@ -51,17 +62,33 @@ class GitLab extends AppSource {
               .toList()
         ];
 
-      var entryId = entry?.querySelector('id')?.innerHtml;
+        var entryId = entry.querySelector('id')?.innerHtml;
         var version =
             entryId == null ? null : Uri.parse(entryId).pathSegments.last;
-      var releaseDateString = entry?.querySelector('updated')?.innerHtml;
+        var releaseDateString = entry.querySelector('updated')?.innerHtml;
-      DateTime? releaseDate =
+        DateTime? releaseDate = releaseDateString != null
-          releaseDateString != null ? DateTime.parse(releaseDateString) : null;
+            ? DateTime.parse(releaseDateString)
+            : null;
         if (version == null) {
           throw NoVersionError();
         }
-      return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl),
+        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;
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/html.dart

@@ -10,9 +10,6 @@ class HTML extends AppSource {
     return url;
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
@@ -37,15 +34,22 @@ class HTML extends AppSource {
       var rel = links.last;
       var apkName = rel.split('/').last;
       var version = apkName.substring(0, apkName.length - 4);
-      List<String> apkUrls = [rel]
+      List<String> apkUrls = [rel].map((e) {
-          .map((e) => e.toLowerCase().startsWith('http://') ||
+        try {
-                  e.toLowerCase().startsWith('https://')
+          Uri.parse(e).origin;
-              ? e
+          return e;
-              : e.startsWith('/')
+        } catch (err) {
-                  ? '${uri.origin}/$e'
+          // is relative
-                  : '${uri.origin}/${uri.path}/$e')
+        }
-          .toList();
+        var currPathSegments = uri.path.split('/');
-      return APKDetails(version, apkUrls, AppNames(uri.host, tr('app')));
+        if (e.startsWith('/') || currPathSegments.isEmpty) {
+          return '${uri.origin}/$e';
+        } else {
+          return '${uri.origin}/${currPathSegments.sublist(0, currPathSegments.length - 1).join('/')}/$e';
+        }
+      }).toList();
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames(uri.host, tr('app')));
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/izzyondroid.dart

@@ -18,9 +18,6 @@ class IzzyOnDroid extends AppSource {
     return url.substring(0, match.end);
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   String? tryInferringAppId(String standardUrl,
       {Map<String, dynamic> additionalSettings = const {}}) {

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';
 
@@ -29,19 +30,37 @@ class Mullvad extends AppSource {
   ) async {
     Response res = await get(Uri.parse('$standardUrl/en/download/android'));
     if (res.statusCode == 200) {
-      var version = parse(res.body)
+      var versions = parse(res.body)
-          .querySelector('p.subtitle.is-6')
+          .querySelectorAll('p')
-          ?.querySelector('a')
+          .map((e) => e.innerHtml)
-          ?.attributes['href']
+          .where((p) => p.contains('Latest version: '))
-          ?.split('/')
+          .map((e) {
-          .last;
+            var match = RegExp('[0-9]+(\\.[0-9]+)*').firstMatch(e);
-      if (version == null) {
+            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,
+          versions[0],
-          ['https://mullvad.net/download/app/apk/latest'],
+          getApkUrlsFromUrls(['https://mullvad.net/download/app/apk/latest']),
-          AppNames(name, 'Mullvad-VPN'));
+          AppNames(name, 'Mullvad-VPN'),
+          changeLog: changeLog);
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/neutroncode.dart

@@ -97,10 +97,13 @@ class NeutronCode extends AppSource {
       var dateString = dateStringOriginal != null
           ? (customDateParse(dateStringOriginal))
           : null;
-
+      var changeLogElements = http.querySelectorAll('.pd-fdesc p');
-      return APKDetails(version, [apkUrl],
+      return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
           AppNames(runtimeType.toString(), name ?? standardUrl.split('/').last),
-          releaseDate: dateString != null ? DateTime.parse(dateString) : null);
+          releaseDate: dateString != null ? DateTime.parse(dateString) : null,
+          changeLog: changeLogElements.isNotEmpty
+              ? changeLogElements.last.innerHtml
+              : null);
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/signal.dart

@@ -13,9 +13,6 @@ class Signal extends AppSource {
     return 'https://$host';
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
@@ -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

@@ -18,9 +18,6 @@ class SourceForge extends AppSource {
     return url.substring(0, match.end);
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
@@ -34,7 +31,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 +51,7 @@ class SourceForge extends AppSource {
               .toList();
       return APKDetails(
           version,
-          apkUrlList,
+          getApkUrlsFromUrls(apkUrlList),
           AppNames(
               name, standardUrl.substring(standardUrl.lastIndexOf('/') + 1)));
     } else {

lib/app_sources/steammobile.dart

@@ -24,9 +24,6 @@ class SteamMobile extends AppSource {
     return 'https://$host';
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
@@ -56,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

@@ -15,9 +15,6 @@ class TelegramApp extends AppSource {
     return 'https://$host';
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
@@ -35,7 +32,8 @@ class TelegramApp extends AppSource {
         throw NoVersionError();
       }
       String? apkUrl = 'https://telegram.org/dl/android/apk';
-      return APKDetails(version, [apkUrl], AppNames('Telegram', 'Telegram'));
+      return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
+          AppNames('Telegram', 'Telegram'));
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/vlc.dart

@@ -0,0 +1,63 @@
+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';
+  }
+
+  @override
+  String standardizeURL(String url) {
+    return 'https://$host';
+  }
+
+  @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/';
+      Response res2 = await get(Uri.parse(targetUrl));
+      String mirrorDwBase =
+          'https://plug-mirror.rcac.purdue.edu/vlc/vlc-android/$version/';
+      List<String> apkUrls = [];
+      if (res2.statusCode == 200) {
+        apkUrls = parse(res2.body)
+            .querySelectorAll('a')
+            .map((e) => e.attributes['href'])
+            .where((h) =>
+                h != null && h.isNotEmpty && h.toLowerCase().endsWith('.apk'))
+            .map((e) => mirrorDwBase + e!)
+            .toList();
+      } else {
+        throw getObtainiumHttpError(res2);
+      }
+
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames('VideoLAN', 'VLC'));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/app_sources/whatsapp.dart

@@ -0,0 +1,75 @@
+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 standardizeURL(String url) {
+    return 'https://$host';
+  }
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async {
+    Response res = await get(Uri.parse('https://www.whatsapp.com/android'));
+    if (res.statusCode == 200) {
+      var targetLinks = parse(res.body)
+          .querySelectorAll('a')
+          .map((e) => e.attributes['href'])
+          .where((e) => e != null)
+          .where((e) =>
+              e!.contains('scontent.whatsapp.net') &&
+              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 {
+    Response res = await get(Uri.parse('https://www.whatsapp.com/android'));
+    if (res.statusCode == 200) {
+      var targetElements = parse(res.body)
+          .querySelectorAll('p')
+          .where((element) => element.innerHtml.contains('Version '))
+          .toList();
+      if (targetElements.isEmpty) {
+        throw NoVersionError();
+      }
+      var vLines = targetElements[0]
+          .innerHtml
+          .split('\n')
+          .where((element) => element.contains('Version '))
+          .toList();
+      if (vLines.isEmpty) {
+        throw NoVersionError();
+      }
+      var versionMatch = RegExp('[0-9]+(\\.[0-9]+)+').firstMatch(vLines[0]);
+      if (versionMatch == null) {
+        throw NoVersionError();
+      }
+      String version =
+          vLines[0].substring(versionMatch.start, versionMatch.end);
+      return APKDetails(
+          version,
+          getApkUrlsFromUrls([
+            'https://www.whatsapp.com/android?v=$version&=thisIsaPlaceholder&a=realURLPrefetchedAtDownloadTime'
+          ]),
+          AppNames('Meta', 'WhatsApp'));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/components/generated_form.dart

@@ -48,6 +48,7 @@ class GeneratedFormTextField extends GeneratedFormItem {
 
 class GeneratedFormDropdown extends GeneratedFormItem {
   late List<MapEntry<String, String>>? opts;
+  List<String>? disabledOptKeys;
 
   GeneratedFormDropdown(
     String key,
@@ -55,6 +56,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,
@@ -225,10 +227,15 @@ class _GeneratedFormState extends State<GeneratedForm> {
           return DropdownButtonFormField(
               decoration: InputDecoration(labelText: formItem.label),
               value: values[formItem.key],
-              items: formItem.opts!
+              items: formItem.opts!.map((e2) {
-                  .map((e2) =>
+                var enabled =
-                      DropdownMenuItem(value: e2.key, child: Text(e2.value)))
+                    formItem.disabledOptKeys?.contains(e2.key) != true;
-                  .toList(),
+                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;
@@ -260,7 +267,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
           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) {
@@ -476,6 +486,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/main.dart

@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.11.10';
+const String currentVersion = '0.11.34';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
@@ -147,6 +147,14 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
 
 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(
@@ -210,7 +218,7 @@ class _ObtainiumState extends State<Obtainium> {
               {'includePrereleases': true},
               null,
               false)
-        ]);
+        ], onlyIfExists: false);
       }
       if (!supportedLocales
               .map((e) => e.languageCode)
@@ -255,6 +263,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,

lib/pages/add_app.dart

@@ -33,10 +33,10 @@ class _AddAppPageState extends State<AddAppPage> {
   bool additionalSettingsValid = true;
   List<String> pickedCategories = [];
   int searchnum = 0;
+  SourceProvider sourceProvider = SourceProvider();
 
   @override
   Widget build(BuildContext context) {
-    SourceProvider sourceProvider = SourceProvider();
     AppsProvider appsProvider = context.read<AppsProvider>();
 
     bool doingSomething = gettingAppInfo || searching;
@@ -64,15 +64,8 @@ class _AddAppPageState extends State<AddAppPage> {
       }
     }
 
-    addApp({bool resetUserInputAfter = false}) async {
+    getTrackOnlyConfirmationIfNeeded(bool userPickedTrackOnly) async {
-      setState(() {
+      return (!((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
-        gettingAppInfo = true;
-      });
-      var settingsProvider = context.read<SettingsProvider>();
-      () async {
-        var userPickedTrackOnly = additionalSettings['trackOnly'] == true;
-        var cont = true;
-        if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
           // ignore: use_build_context_synchronously
           await showDialog(
                   context: context,
@@ -88,10 +81,13 @@ class _AddAppPageState extends State<AddAppPage> {
                           '${pickedSource!.enforceTrackOnly ? tr('appsFromSourceAreTrackOnly') : tr('youPickedTrackOnly')}\n\n${tr('trackOnlyAppDescription')}',
                     );
                   }) ==
-                null) {
+              null));
-          cont = false;
     }
-        if (additionalSettings['versionDetection'] == 'releaseDateAsVersion' &&
+
+    getReleaseDateAsVersionConfirmationIfNeeded(
+        bool userPickedTrackOnly) async {
+      return (!(additionalSettings['versionDetection'] ==
+              'releaseDateAsVersion' &&
           // ignore: use_build_context_synchronously
           await showDialog(
                   context: context,
@@ -102,27 +98,22 @@ class _AddAppPageState extends State<AddAppPage> {
                       message: tr('releaseDateAsVersionExplanation'),
                     );
                   }) ==
-                null) {
+              null));
-          cont = false;
     }
-        if (additionalSettings['versionDetection'] == 'noVersionDetection' &&
+
-            // ignore: use_build_context_synchronously
+    addApp({bool resetUserInputAfter = false}) async {
-            await showDialog(
+      setState(() {
-                    context: context,
+        gettingAppInfo = true;
-                    builder: (BuildContext ctx) {
+      });
-                      return GeneratedFormModal(
+      try {
-                        title: tr('disableVersionDetection'),
+        var settingsProvider = context.read<SettingsProvider>();
-                        items: const [],
+        var userPickedTrackOnly = additionalSettings['trackOnly'] == true;
-                        message: tr('noVersionDetectionExplanation'),
+        App? app;
-                      );
+        if ((await getTrackOnlyConfirmationIfNeeded(userPickedTrackOnly)) &&
-                    }) ==
+            (await getReleaseDateAsVersionConfirmationIfNeeded(
-                null) {
+                userPickedTrackOnly))) {
-          cont = false;
-        }
-        if (cont) {
-          HapticFeedback.selectionClick();
           var trackOnly = pickedSource!.enforceTrackOnly || userPickedTrackOnly;
-          App app = await sourceProvider.getApp(
+          app = await sourceProvider.getApp(
               pickedSource!, userInput, additionalSettings,
               trackOnlyOverride: trackOnly);
           if (!trackOnly) {
@@ -136,7 +127,8 @@ class _AddAppPageState extends State<AddAppPage> {
             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);
@@ -149,39 +141,25 @@ class _AddAppPageState extends State<AddAppPage> {
             app.installedVersion = app.latestVersion;
           }
           app.categories = pickedCategories;
-          await appsProvider.saveApps([app]);
+          await appsProvider.saveApps([app], onlyIfExists: false);
-
-          return app;
         }
-      }()
-          .then((app) {
         if (app != null) {
-          Navigator.push(context,
+          Navigator.push(globalNavigatorKey.currentContext ?? context,
-              MaterialPageRoute(builder: (context) => AppPage(appId: app.id)));
+              MaterialPageRoute(builder: (context) => AppPage(appId: app!.id)));
         }
-      }).catchError((e) {
+      } catch (e) {
         showError(e, context);
-      }).whenComplete(() {
+      } finally {
         setState(() {
           gettingAppInfo = false;
           if (resetUserInputAfter) {
             changeUserInput('', false, true);
           }
         });
-      });
+      }
     }
 
-    return Scaffold(
+    Widget getUrlInputRow() => Row(
-        backgroundColor: Theme.of(context).colorScheme.surface,
-        body: CustomScrollView(slivers: <Widget>[
-          CustomAppBar(title: tr('addApp')),
-          SliverFillRemaining(
-            child: Padding(
-                padding: const EdgeInsets.all(16),
-                child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.stretch,
-                    children: [
-                      Row(
           children: [
             Expanded(
                 child: GeneratedForm(
@@ -197,8 +175,7 @@ class _AddAppPageState extends State<AddAppPage> {
                                   sourceProvider
                                       .getSource(value ?? '')
                                       .standardizeURL(
-                                                        preStandardizeUrl(
+                                          preStandardizeUrl(value ?? ''));
-                                                            value ?? ''));
                                 } catch (e) {
                                   return e is String
                                       ? e
@@ -212,8 +189,8 @@ class _AddAppPageState extends State<AddAppPage> {
                       ]
                     ],
                     onValueChanges: (values, valid, isBuilding) {
-                                    changeUserInput(values['appSourceURL']!,
+                      changeUserInput(
-                                        valid, isBuilding);
+                          values['appSourceURL']!, valid, isBuilding);
                     })),
             const SizedBox(
               width: 16,
@@ -223,47 +200,85 @@ class _AddAppPageState extends State<AddAppPage> {
                 : ElevatedButton(
                     onPressed: doingSomething ||
                             pickedSource == null ||
-                                          (pickedSource!
+                            (pickedSource!.combinedAppSpecificSettingFormItems
-                                                  .combinedAppSpecificSettingFormItems
                                     .isNotEmpty &&
                                 !additionalSettingsValid)
                         ? null
-                                      : addApp,
+                        : () {
+                            HapticFeedback.selectionClick();
+                            addApp();
+                          },
                     child: Text(tr('add')))
           ],
-                      ),
+        );
-                      if (sourceProvider.sources
+
+    runSearch() async {
+      setState(() {
+        searching = true;
+      });
+      try {
+        var results = await Future.wait(sourceProvider.sources
             .where((e) => e.canSearch)
-                              .isNotEmpty &&
+            .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
+            ? []
+            // 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;
+        });
+      }
+    }
+
+    bool shouldShowSearchBar() =>
+        sourceProvider.sources.where((e) => e.canSearch).isNotEmpty &&
         pickedSource == null &&
-                          userInput.isEmpty)
+        userInput.isEmpty;
-                        const SizedBox(
+
-                          height: 16,
+    Widget getSearchBarRow() => Row(
-                        ),
-                      if (sourceProvider.sources
-                              .where((e) => e.canSearch)
-                              .isNotEmpty &&
-                          pickedSource == null &&
-                          userInput.isEmpty)
-                        Row(
           children: [
             Expanded(
               child: GeneratedForm(
                   items: [
                     [
-                                      GeneratedFormTextField(
+                      GeneratedFormTextField('searchSomeSources',
-                                          'searchSomeSources',
+                          label: tr('searchSomeSourcesLabel'), required: false),
-                                          label: tr('searchSomeSourcesLabel'),
-                                          required: false),
                     ]
                   ],
                   onValueChanges: (values, valid, isBuilding) {
-                                    if (values.isNotEmpty &&
+                    if (values.isNotEmpty && valid && !isBuilding) {
-                                        valid &&
-                                        !isBuilding) {
                       setState(() {
-                                        searchQuery =
+                        searchQuery = values['searchSomeSources']!.trim();
-                                            values['searchSomeSources']!.trim();
                       });
                     }
                   }),
@@ -275,61 +290,13 @@ class _AddAppPageState extends State<AddAppPage> {
                 onPressed: searchQuery.isEmpty || doingSomething
                     ? null
                     : () {
-                                        setState(() {
+                        runSearch();
-                                          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,
-                                                isSearch: true);
-                                          }
-                                        }).catchError((e) {
-                                          showError(e, context);
-                                        }).whenComplete(() {
-                                          setState(() {
-                                            searching = false;
-                                          });
-                                        });
                       },
                 child: Text(tr('search')))
           ],
-                        ),
+        );
-                      if (pickedSource != null)
+
-                        Column(
+    Widget getAdditionalOptsCol() => Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
             const Divider(
@@ -338,16 +305,13 @@ class _AddAppPageState extends State<AddAppPage> {
             Text(
                 tr('additionalOptsFor',
                     args: [pickedSource?.name ?? tr('source')]),
-                                style: TextStyle(
+                style: TextStyle(color: Theme.of(context).colorScheme.primary)),
-                                    color:
-                                        Theme.of(context).colorScheme.primary)),
             const SizedBox(
               height: 16,
             ),
             GeneratedForm(
                 key: Key(pickedSource.runtimeType.toString()),
-                                items: pickedSource!
+                items: pickedSource!.combinedAppSpecificSettingFormItems,
-                                    .combinedAppSpecificSettingFormItems,
                 onValueChanges: (values, valid, isBuilding) {
                   if (!isBuilding) {
                     setState(() {
@@ -369,10 +333,9 @@ class _AddAppPageState extends State<AddAppPage> {
               ],
             ),
           ],
-                        )
+        );
-                      else
+
-                        Expanded(
+    Widget getSourcesListWidget() => Column(
-                            child: Column(
             crossAxisAlignment: CrossAxisAlignment.center,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
@@ -389,10 +352,8 @@ class _AddAppPageState extends State<AddAppPage> {
                   .map((e) => GestureDetector(
                       onTap: e.host != null
                           ? () {
-                                              launchUrlString(
+                              launchUrlString('https://${e.host}',
-                                                  'https://${e.host}',
+                                  mode: LaunchMode.externalApplication);
-                                                  mode: LaunchMode
-                                                      .externalApplication);
                             }
                           : null,
                       child: Text(
@@ -404,7 +365,29 @@ class _AddAppPageState extends State<AddAppPage> {
                             fontStyle: FontStyle.italic),
                       )))
                   .toList()
-                            ])),
+            ]);
+
+    return Scaffold(
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        body: CustomScrollView(shrinkWrap: true, slivers: <Widget>[
+          CustomAppBar(title: tr('addApp')),
+          SliverToBoxAdapter(
+            child: Padding(
+                padding: const EdgeInsets.all(16),
+                child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: [
+                      getUrlInputRow(),
+                      if (shouldShowSearchBar())
+                        const SizedBox(
+                          height: 16,
+                        ),
+                      if (shouldShowSearchBar()) getSearchBarRow(),
+                      if (pickedSource != null)
+                        getAdditionalOptsCol()
+                      else
+                        getSourcesListWidget(),
                       const SizedBox(
                         height: 8,
                       ),

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';
@@ -34,16 +35,22 @@ class _AppPageState extends State<AppPage> {
       });
     }
 
+    bool areDownloadsRunning = appsProvider.areDownloadsRunning();
+
     var sourceProvider = SourceProvider();
-    AppInMemory? app = appsProvider.apps[widget.appId];
+    AppInMemory? app = appsProvider.apps[widget.appId]?.deepCopy();
     var source = app != null ? sourceProvider.getSource(app.app.url) : null;
-    if (!appsProvider.areDownloadsRunning() && prevApp == null && app != null) {
+    if (!areDownloadsRunning && prevApp == null && app != null) {
       prevApp = app;
       getUpdate(app.app.id);
     }
     var trackOnly = app?.app.additionalSettings['trackOnly'] == true;
 
-    var infoColumn = Column(
+    bool isVersionDetectionStandard =
+        app?.app.additionalSettings['versionDetection'] ==
+            'standardVersionDetection';
+
+    getInfoColumn() => Column(
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
@@ -54,6 +61,12 @@ class _AppPageState extends State<AppPage> {
                         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,
@@ -66,7 +79,8 @@ class _AppPageState extends State<AppPage> {
               height: 32,
             ),
             Text(
-          tr('latestVersionX', args: [app?.app.latestVersion ?? tr('unknown')]),
+              tr('latestVersionX',
+                  args: [app?.app.latestVersion ?? tr('unknown')]),
               textAlign: TextAlign.center,
               style: Theme.of(context).textTheme.bodyLarge,
             ),
@@ -79,6 +93,19 @@ class _AppPageState extends State<AppPage> {
               textAlign: TextAlign.center,
               style: Theme.of(context).textTheme.bodyLarge,
             ),
+            if (app?.app.installedVersion != null &&
+                !isVersionDetectionStandard)
+              Column(
+                children: [
+                  const SizedBox(
+                    height: 4,
+                  ),
+                  Text(
+                    tr('noVersionDetection'),
+                    style: Theme.of(context).textTheme.labelSmall,
+                  )
+                ],
+              ),
             const SizedBox(
               height: 32,
             ),
@@ -96,8 +123,9 @@ class _AppPageState extends State<AppPage> {
             ),
             CategoryEditorSelector(
                 alignment: WrapAlignment.center,
-            preselected:
+                preselected: app?.app.categories != null
-                app?.app.categories != null ? app!.app.categories.toSet() : {},
+                    ? app!.app.categories.toSet()
+                    : {},
                 onSelected: (categories) {
                   if (app != null) {
                     app.app.categories = categories;
@@ -107,7 +135,7 @@ class _AppPageState extends State<AppPage> {
           ],
         );
 
-    var fullInfoColumn = Column(
+    getFullInfoColumn() => Column(
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
@@ -125,7 +153,7 @@ class _AppPageState extends State<AppPage> {
               height: 25,
             ),
             Text(
-          app?.installedInfo?.name ?? app?.app.name ?? tr('app'),
+              app?.name ?? tr('app'),
               textAlign: TextAlign.center,
               style: Theme.of(context).textTheme.displayLarge,
             ),
@@ -152,51 +180,171 @@ class _AppPageState extends State<AppPage> {
             const SizedBox(
               height: 32,
             ),
-        infoColumn,
+            getInfoColumn(),
             const SizedBox(height: 150)
           ],
         );
 
-    return Scaffold(
+    getAppWebView() => app != null
-      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(
+              ..setBackgroundColor(Theme.of(context).colorScheme.background)
-                            Theme.of(context).colorScheme.background)
               ..setJavaScriptMode(JavaScriptMode.unrestricted)
               ..setNavigationDelegate(
                 NavigationDelegate(
                   onWebResourceError: (WebResourceError error) {
                     if (error.isForMainFrame == true) {
                       showError(
-                                    ObtainiumError(error.description,
+                          ObtainiumError(error.description, unexpected: true),
-                                        unexpected: true),
                           context);
                     }
                   },
                 ),
               )
               ..loadRequest(Uri.parse(app.app.url)))
-                  : Container()
+        : Container();
-              : CustomScrollView(
+
-                  slivers: [
+    showMarkUpdatedDialog() {
-                    SliverToBoxAdapter(
+      return showDialog(
-                        child: Column(children: [fullInfoColumn])),
+          context: context,
-                  ],
+          builder: (BuildContext ctx) {
-                ),
+            return AlertDialog(
-          onRefresh: () async {
+              title: Text(tr('alreadyUpToDateQuestion')),
-            if (app != null) {
+              actions: [
-              getUpdate(app.app.id);
+                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();
-      bottomSheet: Padding(
+                    },
-          padding: EdgeInsets.fromLTRB(
+                    child: Text(tr('yesMarkUpdated')))
-              0, 0, 0, MediaQuery.of(context).padding.bottom),
+              ],
+            );
+          });
+    }
+
+    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
+          showError(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')));
+
+    getInstallOrUpdateButton() => TextButton(
+        onPressed: (app?.app.installedVersion == null ||
+                    app?.app.installedVersion != app?.app.latestVersion) &&
+                !areDownloadsRunning
+            ? () async {
+                try {
+                  HapticFeedback.heavyImpact();
+                  if (app?.app.additionalSettings['trackOnly'] != true) {
+                    await settingsProvider.getInstallPermission();
+                  }
+                  var res = await appsProvider.downloadAndInstallLatestApps(
+                      [app!.app.id], globalNavigatorKey.currentContext);
+                  if (res.isNotEmpty && mounted) {
+                    Navigator.of(context).pop();
+                  }
+                } catch (e) {
+                  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: [
@@ -205,129 +353,25 @@ class _AppPageState extends State<AppPage> {
                 child: Row(
                     mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                     children: [
-                        if (app?.app.additionalSettings['versionDetection'] !=
+                      if (app?.app.installedVersion != null &&
-                                'standardVersionDetection' &&
+                          app?.app.installedVersion != app?.app.latestVersion &&
-                            !trackOnly &&
+                          !isVersionDetectionStandard &&
-                            app?.app.installedVersion != null &&
+                          !trackOnly)
-                            app?.app.installedVersion != app?.app.latestVersion)
                         IconButton(
                             onPressed: app?.downloadProgress != null
                                 ? null
-                                  : () {
+                                : showMarkUpdatedDialog,
-                                      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')))
-                                              ],
-                                            );
-                                          });
-                                    },
                             tooltip: tr('markUpdated'),
                             icon: const Icon(Icons.done)),
                       if (source != null &&
-                            source
+                          source.combinedAppSpecificSettingFormItems.isNotEmpty)
-                                .combinedAppSpecificSettingFormItems.isNotEmpty)
                         IconButton(
                             onPressed: app?.downloadProgress != null
                                 ? null
-                                  : () {
+                                : () async {
-                                      showDialog<Map<String, dynamic>?>(
+                                    var values =
-                                          context: context,
+                                        await showAdditionalOptionsDialog();
-                                          builder: (BuildContext ctx) {
+                                    handleAdditionalOptionChanges(values);
-                                            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) {
-                                          Map<String, dynamic>
-                                              originalSettings =
-                                              app.app.additionalSettings;
-                                          app.app.additionalSettings = values;
-                                          if (source.enforceTrackOnly) {
-                                            app.app.additionalSettings[
-                                                'trackOnly'] = true;
-                                            showError(
-                                                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);
-                                          });
-                                        }
-                                      });
                                   },
                             tooltip: tr('additionalOptions'),
                             icon: const Icon(Icons.edit)),
@@ -347,9 +391,9 @@ class _AppPageState extends State<AppPage> {
                                   builder: (BuildContext ctx) {
                                     return AlertDialog(
                                       scrollable: true,
-                                        content: infoColumn,
+                                      content: getInfoColumn(),
                                       title: Text(
-                                            '${app.app.name} ${tr('byX', args: [
+                                          '${app.name} ${tr('byX', args: [
                                             app.app.author
                                           ])}'),
                                       actions: [
@@ -366,46 +410,12 @@ class _AppPageState extends State<AppPage> {
                             tooltip: tr('more')),
                       const SizedBox(width: 16.0),
                       Expanded(
-                            child: TextButton(
+                          child: !isVersionDetectionStandard &&
-                                onPressed: (app?.app.installedVersion == null ||
+                                  app?.app.installedVersion != null &&
-                                            app?.app.installedVersion !=
+                                  app?.app.installedVersion ==
-                                                app?.app.latestVersion) &&
+                                      app?.app.latestVersion
-                                        !appsProvider.areDownloadsRunning()
+                              ? getResetInstallStatusButton()
-                                    ? () {
+                              : getInstallOrUpdateButton()),
-                                        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);
-                                          });
-                                        }).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),
                       Expanded(
                           child: TextButton(
@@ -433,7 +443,25 @@ class _AppPageState extends State<AppPage> {
                   child: LinearProgressIndicator(
                       value: app!.downloadProgress! / 100))
           ],
-          )),
+        ));
-    );
+
+    return Scaffold(
+        appBar: settingsProvider.showAppWebpage ? AppBar() : null,
+        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/import_export.dart

@@ -30,6 +30,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
     SourceProvider sourceProvider = SourceProvider();
     var appsProvider = context.read<AppsProvider>();
     var settingsProvider = context.read<SettingsProvider>();
+
     var outlineButtonStyle = ButtonStyle(
       shape: MaterialStateProperty.all(
         StadiumBorder(
@@ -101,6 +102,193 @@ class _ImportExportPageState extends State<ImportExportPage> {
       });
     }
 
+    runObtainiumExport() {
+      HapticFeedback.selectionClick();
+      appsProvider.exportApps().then((String path) {
+        showError(tr('exportedTo', args: [path]), 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);
+            showError(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'))
+                  ]
+                ],
+              );
+            });
+        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 =
+                // 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
+                showError(
+                    tr('importedX', args: [plural('app', 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
+              showError(
+                  tr('importedX', args: [plural('app', 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>[
@@ -120,18 +308,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                   onPressed: appsProvider.apps.isEmpty ||
                                           importInProgress
                                       ? null
-                                      : () {
+                                      : runObtainiumExport,
-                                          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,
@@ -141,59 +318,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                   style: outlineButtonStyle,
                                   onPressed: importInProgress
                                       ? null
-                                      : () {
+                                      : 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;
-                                                    }
-                                                  }
-                                                });
-                                                settingsProvider.categories =
-                                                    cats;
-                                                showError(
-                                                    tr('importedX', args: [
-                                                      plural('apps', value)
-                                                    ]),
-                                                    context);
-                                              });
-                                            } else {
-                                              // User canceled the picker
-                                            }
-                                          }).catchError((e) {
-                                            showError(e, context);
-                                          }).whenComplete(() {
-                                            setState(() {
-                                              importInProgress = false;
-                                            });
-                                          });
-                                        },
                                   child: Text(tr('obtainiumImport'))))
                         ],
                       ),
@@ -216,49 +341,15 @@ class _ImportExportPageState extends State<ImportExportPage> {
                               height: 32,
                             ),
                             TextButton(
-                                onPressed: importInProgress
+                                onPressed:
-                                    ? null
+                                    importInProgress ? null : urlListImport,
-                                    : () {
-                                        urlListImport();
-                                      },
                                 child: Text(
                                   tr('importFromURLList'),
                                 )),
                             const SizedBox(height: 8),
                             TextButton(
-                                onPressed: importInProgress
+                                onPressed:
-                                    ? null
+                                    importInProgress ? null : 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'));
-                                          }
-                                        });
-                                      },
                                 child: Text(
                                   tr('importFromURLsInFile'),
                                 )),
@@ -275,106 +366,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                         onPressed: importInProgress
                                             ? null
                                             : () {
-                                                () async {
+                                                runSourceSearch(source);
-                                                  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 =
-                                                          // 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
-                                                          showError(
-                                                              tr('importedX',
-                                                                  args: [
-                                                                    plural(
-                                                                        'app',
-                                                                        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;
-                                                  });
-                                                });
                                               },
                                         child: Text(
                                             tr('searchX', args: [source.name])))
@@ -390,93 +382,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                         onPressed: importInProgress
                                             ? null
                                             : () {
-                                                () async {
+                                                runMassSourceImport(source);
-                                                  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
-                                                        showError(
-                                                            tr('importedX',
-                                                                args: [
-                                                                  plural(
-                                                                      'app',
-                                                                      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;
-                                                  });
-                                                });
                                               },
                                         child: Text(
                                             tr('importX', args: [source.name])))
@@ -600,7 +506,7 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
           widget.onlyOneSelectionAllowed ? tr('selectURL') : tr('selectURLs')),
       content: Column(children: [
         ...urlWithDescriptionSelections.keys.map((urlWithD) {
-          select(bool? value) {
+          selectThis(bool? value) {
             setState(() {
               value ??= false;
               if (value! && widget.onlyOneSelectionAllowed) {
@@ -611,11 +517,56 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
             });
           }
 
-          return Row(children: [
+          var 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,
+              ));
+
+          var descriptionText = Text(
+            urlWithD.value.length > 128
+                ? '${urlWithD.value.substring(0, 128)}...'
+                : urlWithD.value,
+            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) {
-                  select(value);
+                  selectThis(value);
                 }),
             const SizedBox(
               width: 8,
@@ -628,28 +579,13 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
                 const SizedBox(
                   height: 8,
                 ),
+                urlLink,
                 GestureDetector(
                   onTap: () {
-                      launchUrlString(urlWithD.key,
+                    selectThis(
-                          mode: LaunchMode.externalApplication);
+                        !(urlWithDescriptionSelections[urlWithD] ?? false));
                   },
-                    child: Text(
+                  child: descriptionText,
-                      Uri.parse(urlWithD.key).path.substring(1),
-                      style:
-                          const TextStyle(decoration: TextDecoration.underline),
-                      textAlign: TextAlign.start,
-                    )),
-                GestureDetector(
-                  onTap: () {
-                    select(!(urlWithDescriptionSelections[urlWithD] ?? false));
-                  },
-                  child: Text(
-                    urlWithD.value.length > 128
-                        ? '${urlWithD.value.substring(0, 128)}...'
-                        : urlWithD.value,
-                    style: const TextStyle(
-                        fontStyle: FontStyle.italic, fontSize: 12),
-                  ),
                 ),
                 const SizedBox(
                   height: 8,
@@ -657,6 +593,10 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
               ],
             ))
           ]);
+
+          return widget.onlyOneSelectionAllowed
+              ? singleSelectTile
+              : multiSelectTile;
         })
       ]),
       actions: [

lib/pages/settings.dart

@@ -6,6 +6,7 @@ import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.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';
@@ -223,6 +224,17 @@ class _SettingsPageState extends State<SettingsPage> {
                             ),
                             themeDropdown,
                             height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text(tr('useBlackTheme')),
+                                Switch(
+                                    value: settingsProvider.useBlackTheme,
+                                    onChanged: (value) {
+                                      settingsProvider.useBlackTheme = value;
+                                    })
+                              ],
+                            ),
                             colourDropdown,
                             height16,
                             Row(
@@ -262,6 +274,18 @@ class _SettingsPageState extends State<SettingsPage> {
                                     })
                               ],
                             ),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text(tr('groupByCategory')),
+                                Switch(
+                                    value: settingsProvider.groupByCategory,
+                                    onChanged: (value) {
+                                      settingsProvider.groupByCategory = value;
+                                    })
+                              ],
+                            ),
                             const Divider(
                               height: 16,
                             ),
@@ -432,6 +456,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,
@@ -455,8 +480,9 @@ class _CategoryEditorSelectorState extends State<CategoryEditorSelector> {
           if (!isBuilding) {
             storedValues =
                 values['categories'] as Map<String, MapEntry<int, bool>>;
-            settingsProvider.categories =
+            settingsProvider.setCategories(
-                storedValues.map((key, value) => MapEntry(key, value.key));
+                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/apps_provider.dart

@@ -34,6 +34,10 @@ class AppInMemory {
   AppInfo? installedInfo;
 
   AppInMemory(this.app, this.downloadProgress, this.installedInfo);
+  AppInMemory deepCopy() =>
+      AppInMemory(app.deepCopy(), downloadProgress, installedInfo);
+
+  String get name => app.overrideName ?? installedInfo?.name ?? app.finalName;
 }
 
 class DownloadedApk {
@@ -73,6 +77,18 @@ List<String> generateStandardVersionRegExStrings() {
 List<String> standardVersionRegExStrings =
     generateStandardVersionRegExStrings();
 
+Set<String> findStandardFormatsForVersion(String version, bool strict) {
+  // If !strict, even a substring match is valid
+  Set<String> results = {};
+  for (var pattern in standardVersionRegExStrings) {
+    if (RegExp('${strict ? '^' : ''}$pattern${strict ? '\$' : ''}')
+        .hasMatch(version)) {
+      results.add(pattern);
+    }
+  }
+  return results;
+}
+
 class AppsProvider with ChangeNotifier {
   // In memory App state (should always be kept in sync with local storage versions)
   Map<String, AppInMemory> apps = {};
@@ -85,6 +101,8 @@ class AppsProvider with ChangeNotifier {
   late Stream<FGBGType>? foregroundStream;
   late StreamSubscription<FGBGType>? foregroundSubscription;
 
+  Iterable<AppInMemory> getAppValues() => apps.values.map((a) => a.deepCopy());
+
   AppsProvider() {
     // Subscribe to changes in the app foreground status
     foregroundStream = FGBGEvents.stream.asBroadcastStream();
@@ -147,18 +165,17 @@ class AppsProvider with ChangeNotifier {
   Future<DownloadedApk> downloadApp(App app, BuildContext? context) async {
     NotificationsProvider? notificationsProvider =
         context?.read<NotificationsProvider>();
-    var notifId = DownloadNotification(app.name, 0).id;
+    var notifId = DownloadNotification(app.finalName, 0).id;
     if (apps[app.id] != null) {
       apps[app.id]!.downloadProgress = 0;
       notifyListeners();
     }
     try {
-      var fileName =
-          '${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk';
       String downloadUrl = await SourceProvider()
           .getSource(app.url)
-          .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex]);
+          .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex].value);
-      var notif = DownloadNotification(app.name, 100);
+      var fileName = '${app.id}-${downloadUrl.hashCode}.apk';
+      var notif = DownloadNotification(app.finalName, 100);
       notificationsProvider?.cancel(notif.id);
       int? prevProg;
       File downloadedFile =
@@ -168,7 +185,7 @@ class AppsProvider with ChangeNotifier {
           apps[app.id]!.downloadProgress = progress;
           notifyListeners();
         }
-        notif = DownloadNotification(app.name, prog ?? 100);
+        notif = DownloadNotification(app.finalName, prog ?? 100);
         if (prog != null && prevProg != prog) {
           notificationsProvider?.notify(notif);
         }
@@ -187,16 +204,17 @@ class AppsProvider with ChangeNotifier {
       // The former case should be handled (give the App its real ID), the latter is a security issue
       var newInfo = await PackageArchiveInfo.fromPath(downloadedFile.path);
       if (app.id != newInfo.packageName) {
-        if (apps[app.id] != null && !SourceProvider().isTempId(app)) {
+        var isTempId = SourceProvider().isTempId(app);
+        if (apps[app.id] != null && !isTempId) {
           throw IDChangedError();
         }
         var originalAppId = app.id;
         app.id = newInfo.packageName;
         downloadedFile = downloadedFile.renameSync(
-            '${downloadedFile.parent.path}/${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk');
+            '${downloadedFile.parent.path}/${app.id}-${downloadUrl.hashCode}.apk');
         if (apps[originalAppId] != null) {
           await removeApps([originalAppId]);
-          await saveApps([app]);
+          await saveApps([app], onlyIfExists: !isTempId);
         }
       }
       return DownloadedApk(app.id, downloadedFile);
@@ -284,9 +302,11 @@ class AppsProvider with ChangeNotifier {
     await intent.launch();
   }
 
-  Future<String?> confirmApkUrl(App app, BuildContext? context) async {
+  Future<MapEntry<String, String>?> confirmApkUrl(
+      App app, BuildContext? context) async {
     // If the App has more than one APK, the user should pick one (if context provided)
-    String? apkUrl = app.apkUrls[app.preferredApkIndex];
+    MapEntry<String, String>? apkUrl =
+        app.apkUrls[app.preferredApkIndex >= 0 ? app.preferredApkIndex : 0];
     // get device supported architecture
     List<String> archs = (await DeviceInfoPlugin().androidInfo).supportedAbis;
 
@@ -309,14 +329,14 @@ class AppsProvider with ChangeNotifier {
 
     // If the picked APK comes from an origin different from the source, get user confirmation (if context provided)
     if (apkUrl != null &&
-        getHost(apkUrl) != getHost(app.url) &&
+        getHost(apkUrl.value) != getHost(app.url) &&
         context != null) {
       // ignore: use_build_context_synchronously
       if (await showDialog(
               context: context,
               builder: (BuildContext ctx) {
                 return APKOriginWarningDialog(
-                    sourceUrl: app.url, apkUrl: apkUrl!);
+                    sourceUrl: app.url, apkUrl: apkUrl!.value);
               }) !=
           true) {
         apkUrl = null;
@@ -341,14 +361,19 @@ class AppsProvider with ChangeNotifier {
       if (apps[id] == null) {
         throw ObtainiumError(tr('appNotFound'));
       }
-      String? apkUrl;
+      MapEntry<String, String>? apkUrl;
       var trackOnly = apps[id]!.app.additionalSettings['trackOnly'] == true;
       if (!trackOnly) {
         apkUrl = await confirmApkUrl(apps[id]!.app, context);
       }
       if (apkUrl != null) {
-        int urlInd = apps[id]!.app.apkUrls.indexOf(apkUrl);
+        int urlInd = apps[id]!
-        if (urlInd != apps[id]!.app.preferredApkIndex) {
+            .app
+            .apkUrls
+            .map((e) => e.value)
+            .toList()
+            .indexOf(apkUrl.value);
+        if (urlInd >= 0 && urlInd != apps[id]!.app.preferredApkIndex) {
           apps[id]!.app.preferredApkIndex = urlInd;
           await saveApps([apps[id]!.app]);
         }
@@ -472,55 +497,110 @@ class AppsProvider with ChangeNotifier {
     return res;
   }
 
-  // If the App says it is installed but installedInfo is null, set it to not installed
+  bool isVersionDetectionPossible(AppInMemory? app) {
-  // If there is any other mismatch between installedInfo and installedVersion, try reconciling them intelligently
+    return app?.app.additionalSettings['trackOnly'] != true &&
-  // If that fails, just set it to the actual version string (all we can do at that point)
+        app?.app.additionalSettings['versionDetection'] !=
-  // Don't save changes, just return the object if changes were made (else null)
+            'releaseDateAsVersion' &&
+        app?.installedInfo?.versionName != null &&
+        app?.app.installedVersion != null &&
+        reconcileVersionDifferences(
+                app!.installedInfo!.versionName!, app.app.installedVersion!) !=
+            null;
+  }
+
+  // Given an App and it's on-device info...
+  // Reconcile unexpected differences between its reported installed version, real installed version, and reported latest version
   App? getCorrectedInstallStatusAppIfPossible(App app, AppInfo? installedInfo) {
     var modded = false;
     var trackOnly = app.additionalSettings['trackOnly'] == true;
     var noVersionDetection = app.additionalSettings['versionDetection'] !=
         'standardVersionDetection';
+    // FIRST, COMPARE THE APP'S REPORTED AND REAL INSTALLED VERSIONS, WHERE ONE IS NULL
     if (installedInfo == null && app.installedVersion != null && !trackOnly) {
+      // App says it's installed but isn't really (and isn't track only) - set to not installed
       app.installedVersion = null;
       modded = true;
     } else if (installedInfo?.versionName != null &&
         app.installedVersion == null) {
+      // App says it's not installed but really is - set to installed and use real package versionName
       app.installedVersion = installedInfo!.versionName;
       modded = true;
-    } else if (installedInfo?.versionName != null &&
+    }
+    // SECOND, RECONCILE DIFFERENCES BETWEEN THE APP'S REPORTED AND REAL INSTALLED VERSIONS, WHERE NEITHER IS NULL
+    if (installedInfo?.versionName != null &&
         installedInfo!.versionName != app.installedVersion &&
         !noVersionDetection) {
-      String? correctedInstalledVersion = reconcileRealAndInternalVersions(
+      // App's reported version and real version don't match (and it uses standard version detection)
+      // If they share a standard format (and are still different under it), update the reported version accordingly
+      var correctedInstalledVersion = reconcileVersionDifferences(
           installedInfo.versionName!, app.installedVersion!);
-      if (correctedInstalledVersion != null) {
+      if (correctedInstalledVersion?.key == false) {
-        app.installedVersion = correctedInstalledVersion;
+        app.installedVersion = correctedInstalledVersion!.value;
         modded = true;
       }
     }
+    // THIRD, RECONCILE THE APP'S REPORTED INSTALLED AND LATEST VERSIONS
     if (app.installedVersion != null &&
         app.installedVersion != app.latestVersion &&
         !noVersionDetection) {
-      app.installedVersion = reconcileRealAndInternalVersions(
+      // App's reported installed and latest versions don't match (and it uses standard version detection)
-              app.installedVersion!, app.latestVersion,
+      // If they share a standard format, make sure the App's reported installed version uses that format
-              matchMode: true) ??
+      var correctedInstalledVersion =
-          app.installedVersion;
+          reconcileVersionDifferences(app.installedVersion!, app.latestVersion);
+      if (correctedInstalledVersion?.key == true) {
+        app.installedVersion = correctedInstalledVersion!.value;
         modded = true;
       }
+    }
+    // FOURTH, DISABLE VERSION DETECTION IF ENABLED AND THE REPORTED/REAL INSTALLED VERSIONS ARE NOT STANDARDIZED
+    if (installedInfo != null &&
+        app.additionalSettings['versionDetection'] ==
+            'standardVersionDetection' &&
+        !isVersionDetectionPossible(AppInMemory(app, null, installedInfo))) {
+      app.additionalSettings['versionDetection'] = 'noVersionDetection';
+      logs.add('Could not reconcile version formats for: ${app.id}');
+      modded = true;
+    }
+    // if (app.installedVersion != null &&
+    //     app.additionalSettings['versionDetection'] ==
+    //         'standardVersionDetection') {
+    //   var correctedInstalledVersion =
+    //       reconcileVersionDifferences(app.installedVersion!, app.latestVersion);
+    //   if (correctedInstalledVersion == null) {
+    //     app.additionalSettings['versionDetection'] = 'noVersionDetection';
+    //     logs.add('Could not reconcile version formats for: ${app.id}');
+    //     modded = true;
+    //   }
+    // }
+
     return modded ? app : null;
   }
 
-  String? reconcileRealAndInternalVersions(
+  MapEntry<bool, String>? reconcileVersionDifferences(
-      String realVersion, String internalVersion,
+      String templateVersion, String comparisonVersion) {
-      {bool matchMode = false}) {
+    // Returns null if the versions don't share a common standard format
-    // 1. If one or both of these can't be converted to a "standard" format, return null (leave as is)
+    // Returns <true, comparisonVersion> if they share a common format and are equal
-    // 2. If both have a "standard" format under which they are equal, return null (leave as is)
+    // Returns <false, templateVersion> if they share a common format but are not equal
-    // 3. If both have a "standard" format in common but are unequal, return realVersion (this means it was changed externally)
+    // templateVersion must fully match a standard format, while comparisonVersion can have a substring match
-    // If in matchMode, the outcomes of rules 2 and 3 are reversed, and the "real" version is not matched strictly
+    var templateVersionFormats =
-    // Matchmode to be used when comparing internal install version and internal latest version
+        findStandardFormatsForVersion(templateVersion, true);
+    var comparisonVersionFormats =
+        findStandardFormatsForVersion(comparisonVersion, false);
+    var commonStandardFormats =
+        templateVersionFormats.intersection(comparisonVersionFormats);
+    if (commonStandardFormats.isEmpty) {
+      return null;
+    }
+    for (String pattern in commonStandardFormats) {
+      if (doStringsMatchUnderRegEx(
+          pattern, comparisonVersion, templateVersion)) {
+        return MapEntry(true, comparisonVersion);
+      }
+    }
+    return MapEntry(false, templateVersion);
+  }
 
-    bool doStringsMatchUnderRegEx(
+  bool doStringsMatchUnderRegEx(String pattern, String value1, String value2) {
-        String pattern, String value1, String value2) {
     var r = RegExp(pattern);
     var m1 = r.firstMatch(value1);
     var m2 = r.firstMatch(value2);
@@ -530,38 +610,6 @@ class AppsProvider with ChangeNotifier {
         : false;
   }
 
-    Set<String> findStandardFormatsForVersion(String version, bool strict) {
-      Set<String> results = {};
-      for (var pattern in standardVersionRegExStrings) {
-        if (RegExp('${strict ? '^' : ''}$pattern${strict ? '\$' : ''}')
-            .hasMatch(version)) {
-          results.add(pattern);
-        }
-      }
-      return results;
-    }
-
-    var realStandardVersionFormats =
-        findStandardFormatsForVersion(realVersion, true);
-    var internalStandardVersionFormats =
-        findStandardFormatsForVersion(internalVersion, false);
-    var commonStandardFormats =
-        realStandardVersionFormats.intersection(internalStandardVersionFormats);
-    if (commonStandardFormats.isEmpty) {
-      return null; // Incompatible; no "enhanced detection"
-    }
-    for (String pattern in commonStandardFormats) {
-      if (doStringsMatchUnderRegEx(pattern, internalVersion, realVersion)) {
-        return matchMode
-            ? internalVersion
-            : null; // Enhanced detection says no change
-      }
-    }
-    return matchMode
-        ? null
-        : realVersion; // Enhanced detection says something changed
-  }
-
   Future<void> loadApps() async {
     while (loadingApps) {
       await Future.delayed(const Duration(microseconds: 1));
@@ -571,7 +619,21 @@ class AppsProvider with ChangeNotifier {
     List<App> newApps = (await getAppsDir())
         .listSync()
         .where((item) => item.path.toLowerCase().endsWith('.json'))
-        .map((e) => App.fromJson(jsonDecode(File(e.path).readAsStringSync())))
+        .map((e) {
+          try {
+            return App.fromJson(jsonDecode(File(e.path).readAsStringSync()));
+          } catch (err) {
+            if (err is FormatException) {
+              logs.add('Corrupt JSON when loading App (will be ignored): $e');
+              e.renameSync('${e.path}.corrupt');
+              return App(
+                  '', '', '', '', '', '', [], 0, {}, DateTime.now(), false);
+            } else {
+              rethrow;
+            }
+          }
+        })
+        .where((element) => element.id.isNotEmpty)
         .toList();
     var idsToDelete = apps.values
         .map((e) => e.app.id)
@@ -588,7 +650,7 @@ class AppsProvider with ChangeNotifier {
         sp.getSource(newApps[i].url);
         apps[newApps[i].id] = AppInMemory(newApps[i], null, info);
       } catch (e) {
-        errors.add([newApps[i].id, newApps[i].name, e.toString()]);
+        errors.add([newApps[i].id, newApps[i].finalName, e.toString()]);
       }
     }
     if (errors.isNotEmpty) {
@@ -614,10 +676,12 @@ class AppsProvider with ChangeNotifier {
   }
 
   Future<void> saveApps(List<App> apps,
-      {bool attemptToCorrectInstallStatus = true}) async {
+      {bool attemptToCorrectInstallStatus = true,
+      bool onlyIfExists = true}) async {
     attemptToCorrectInstallStatus =
         attemptToCorrectInstallStatus && (await doesInstalledAppsPluginWork());
-    for (var app in apps) {
+    for (var a in apps) {
+      var app = a.deepCopy();
       AppInfo? info = await getInstalledInfo(app.id);
       app.name = info?.name ?? app.name;
       if (attemptToCorrectInstallStatus) {
@@ -625,9 +689,15 @@ class AppsProvider with ChangeNotifier {
       }
       File('${(await getAppsDir()).path}/${app.id}.json')
           .writeAsStringSync(jsonEncode(app.toJson()));
+      try {
         this.apps.update(
             app.id, (value) => AppInMemory(app, value.downloadProgress, info),
-          ifAbsent: () => AppInMemory(app, null, info));
+            ifAbsent: onlyIfExists ? null : () => AppInMemory(app, null, info));
+      } catch (e) {
+        if (e is! ArgumentError || e.name != 'key') {
+          rethrow;
+        }
+      }
     }
     notifyListeners();
   }
@@ -648,8 +718,11 @@ class AppsProvider with ChangeNotifier {
   }
 
   Future<bool> removeAppsWithModal(BuildContext context, List<App> apps) async {
-    var showUninstallOption =
+    var showUninstallOption = apps
-        apps.where((a) => a.installedVersion != null).isNotEmpty;
+        .where((a) =>
+            a.installedVersion != null &&
+            a.additionalSettings['trackOnly'] != true)
+        .isNotEmpty;
     var values = await showDialog(
         context: context,
         builder: (BuildContext ctx) {
@@ -698,6 +771,18 @@ class AppsProvider with ChangeNotifier {
     await intent.launch();
   }
 
+  addMissingCategories(SettingsProvider settingsProvider) {
+    var cats = settingsProvider.categories;
+    apps.forEach((key, value) {
+      for (var c in value.app.categories) {
+        if (!cats.containsKey(c)) {
+          cats[c] = generateRandomLightColor().value;
+        }
+      }
+    });
+    settingsProvider.setCategories(cats, appsProvider: this);
+  }
+
   Future<App?> checkUpdate(String appId) async {
     App? currentApp = apps[appId]!.app;
     SourceProvider sourceProvider = SourceProvider();
@@ -777,12 +862,6 @@ class AppsProvider with ChangeNotifier {
   }
 
   Future<String> exportApps() async {
-    Directory? exportDir = Directory('/storage/emulated/0/Download');
-    String path = 'Downloads'; // TODO: See if hardcoding this can be avoided
-    if (!exportDir.existsSync()) {
-      exportDir = await getExternalStorageDirectory();
-      path = exportDir!.path;
-    }
     if ((await DeviceInfoPlugin().androidInfo).version.sdkInt <= 29) {
       if (await Permission.storage.isDenied) {
         await Permission.storage.request();
@@ -791,6 +870,18 @@ class AppsProvider with ChangeNotifier {
         throw ObtainiumError(tr('storagePermissionDenied'));
       }
     }
+    Directory? exportDir = Directory('/storage/emulated/0/Download');
+    String path = 'Downloads'; // TODO: See if hardcoding this can be avoided
+    var downloadsAccessible = false;
+    try {
+      downloadsAccessible = exportDir.existsSync();
+    } catch (e) {
+      logs.add('Error accessing Downloads (will use fallback): $e');
+    }
+    if (!downloadsAccessible) {
+      exportDir = await getExternalStorageDirectory();
+      path = exportDir!.path;
+    }
     File export = File(
         '${exportDir.path}/${tr('obtainiumExportHyphenatedLowercase')}-${DateTime.now().millisecondsSinceEpoch}.json');
     export.writeAsStringSync(
@@ -810,7 +901,7 @@ class AppsProvider with ChangeNotifier {
         a.installedVersion = apps[a.id]?.app.installedVersion;
       }
     }
-    await saveApps(importedApps);
+    await saveApps(importedApps, onlyIfExists: false);
     notifyListeners();
     return importedApps.length;
   }
@@ -823,14 +914,14 @@ class AppsProvider with ChangeNotifier {
 
   Future<List<List<String>>> addAppsByURL(List<String> urls) async {
     List<dynamic> results = await SourceProvider().getAppsByURLNaive(urls,
-        ignoreUrls: apps.values.map((e) => e.app.url).toList());
+        alreadyAddedUrls: apps.values.map((e) => e.app.url).toList());
     List<App> pps = results[0];
     Map<String, dynamic> errorsMap = results[1];
     for (var app in pps) {
       if (apps.containsKey(app.id)) {
         errorsMap.addAll({app.id: tr('appAlreadyAdded')});
       } else {
-        await saveApps([app]);
+        await saveApps([app], onlyIfExists: false);
       }
     }
     List<List<String>> errors =
@@ -843,7 +934,7 @@ class APKPicker extends StatefulWidget {
   const APKPicker({super.key, required this.app, this.initVal, this.archs});
 
   final App app;
-  final String? initVal;
+  final MapEntry<String, String>? initVal;
   final List<String>? archs;
 
   @override
@@ -851,7 +942,7 @@ class APKPicker extends StatefulWidget {
 }
 
 class _APKPickerState extends State<APKPicker> {
-  String? apkUrl;
+  MapEntry<String, String>? apkUrl;
 
   @override
   Widget build(BuildContext context) {
@@ -860,19 +951,17 @@ class _APKPickerState extends State<APKPicker> {
       scrollable: true,
       title: Text(tr('pickAnAPK')),
       content: Column(children: [
-        Text(tr('appHasMoreThanOnePackage', args: [widget.app.name])),
+        Text(tr('appHasMoreThanOnePackage', args: [widget.app.finalName])),
         const SizedBox(height: 16),
         ...widget.app.apkUrls.map(
           (u) => RadioListTile<String>(
-              title: Text(Uri.parse(u)
+              title: Text(u.key),
-                  .pathSegments
+              value: u.value,
-                  .where((element) => element.isNotEmpty)
+              groupValue: apkUrl!.value,
-                  .last),
-              value: u,
-              groupValue: apkUrl,
               onChanged: (String? val) {
                 setState(() {
-                  apkUrl = val;
+                  apkUrl =
+                      widget.app.apkUrls.where((e) => e.value == val).first;
                 });
               }),
         ),

lib/providers/notifications_provider.dart

@@ -34,9 +34,9 @@ class UpdateNotification extends ObtainiumNotification {
     message = updates.isEmpty
         ? tr('noNewUpdates')
         : updates.length == 1
-            ? tr('xHasAnUpdate', args: [updates[0].name])
+            ? tr('xHasAnUpdate', args: [updates[0].finalName])
             : plural('xAndNMoreUpdatesAvailable', updates.length - 1,
-                args: [updates[0].name, (updates.length - 1).toString()]);
+                args: [updates[0].finalName, (updates.length - 1).toString()]);
   }
 }
 
@@ -46,9 +46,9 @@ class SilentUpdateNotification extends ObtainiumNotification {
             tr('appsUpdatedNotifDescription'), Importance.defaultImportance) {
     message = updates.length == 1
         ? tr('xWasUpdatedToY',
-            args: [updates[0].name, updates[0].latestVersion])
+            args: [updates[0].finalName, updates[0].latestVersion])
         : plural('xAndNMoreUpdatesInstalled', updates.length - 1,
-            args: [updates[0].name, (updates.length - 1).toString()]);
+            args: [updates[0].finalName, (updates.length - 1).toString()]);
   }
 }
 

lib/providers/settings_provider.dart

@@ -7,6 +7,8 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/main.dart';
+import 'package:obtainium/providers/apps_provider.dart';
+import 'package:obtainium/providers/source_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -62,6 +64,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)) {
@@ -139,6 +150,15 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
+  bool get groupByCategory {
+    return prefs?.getBool('groupByCategory') ?? false;
+  }
+
+  set groupByCategory(bool show) {
+    prefs?.setBool('groupByCategory', show);
+    notifyListeners();
+  }
+
   String? getSettingString(String settingId) {
     return prefs?.getString(settingId);
   }
@@ -151,7 +171,23 @@ 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,
+            attemptToCorrectInstallStatus: false);
+      }
+    }
     prefs?.setString('categories', jsonEncode(cats));
     notifyListeners();
   }

lib/providers/source_provider.dart

@@ -3,6 +3,7 @@
 
 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';
@@ -20,6 +21,7 @@ import 'package:obtainium/app_sources/signal.dart';
 import 'package:obtainium/app_sources/sourceforge.dart';
 import 'package:obtainium/app_sources/steammobile.dart';
 import 'package:obtainium/app_sources/telegramapp.dart';
+import 'package:obtainium/app_sources/vlc.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
@@ -33,11 +35,13 @@ 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, {this.releaseDate});
+  APKDetails(this.version, this.apkUrls, this.names,
+      {this.releaseDate, this.changeLog});
 }
 
 class App {
@@ -47,13 +51,14 @@ 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;
   App(
       this.id,
       this.url,
@@ -67,13 +72,39 @@ class App {
       this.lastUpdateCheck,
       this.pinned,
       {this.categories = const [],
-      this.releaseDate});
+      this.releaseDate,
+      this.changeLog});
 
   @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);
+
   factory App.fromJson(Map<String, dynamic> json) {
     var source = SourceProvider().getSource(json['url']);
     var formItems = source.combinedAppSpecificSettingFormItems
@@ -105,7 +136,6 @@ class App {
     // 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');
@@ -116,6 +146,7 @@ class App {
       if (additionalSettings['releaseDateAsVersion'] != null) {
         additionalSettings.remove('releaseDateAsVersion');
       }
+    }
     // Ensure additionalSettings are correctly typed
     for (var item in formItems) {
       if (additionalSettings[item.key] != null) {
@@ -129,6 +160,23 @@ class App {
     if (preferredApkIndex < 0) {
       preferredApkIndex = 0;
     }
+    // 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 = List<dynamic>.from(apkUrlJson)
+            .map((e) => MapEntry(e[0] as String, e[1] as String))
+            .toList();
+      }
+    }
+    // Arch based APK filter option should be disabled if it previously did not exist
+    if (json['additionalSettings'] != null &&
+        jsonDecode(json['additionalSettings'])['autoApkFilterByArch'] == null) {
+      additionalSettings['autoApkFilterByArch'] = false;
+    }
     return App(
         json['id'] as String,
         json['url'] as String,
@@ -138,9 +186,7 @@ class App {
             ? null
             : json['installedVersion'] as String,
         json['latestVersion'] as String,
-      json['apkUrls'] == null
+        apkUrls,
-          ? []
-          : List<String>.from(jsonDecode(json['apkUrls'])),
         preferredApkIndex,
         additionalSettings,
         json['lastUpdateCheck'] == null
@@ -157,7 +203,8 @@ class App {
         releaseDate: json['releaseDate'] == null
             ? null
             : DateTime.fromMicrosecondsSinceEpoch(json['releaseDate']),
-    );
+        changeLog:
+            json['changeLog'] == null ? null : json['changeLog'] as String);
   }
 
   Map<String, dynamic> toJson() => {
@@ -167,13 +214,14 @@ class App {
         'name': name,
         'installedVersion': installedVersion,
         'latestVersion': latestVersion,
-        'apkUrls': jsonEncode(apkUrls),
+        'apkUrls': jsonEncode(apkUrls.map((e) => [e.key, e.value]).toList()),
         'preferredApkIndex': preferredApkIndex,
         'additionalSettings': jsonEncode(additionalSettings),
         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
         'pinned': pinned,
         'categories': categories,
-        'releaseDate': releaseDate?.microsecondsSinceEpoch
+        'releaseDate': releaseDate?.microsecondsSinceEpoch,
+        'changeLog': changeLog
       };
 }
 
@@ -218,10 +266,18 @@ Map<String, dynamic> getDefaultValuesFromFormItems(
       .reduce((value, element) => [...value, ...element]));
 }
 
+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();
+
 class AppSource {
   String? host;
   late String name;
   bool enforceTrackOnly = false;
+  bool changeLogIfAnyIsMarkDown = true;
 
   AppSource() {
     name = runtimeType.toString();
@@ -270,7 +326,12 @@ class AppSource {
               return regExValidator(value);
             }
           ])
-    ]
+    ],
+    [
+      GeneratedFormSwitch('autoApkFilterByArch',
+          label: tr('autoApkFilterByArch'), defaultValue: true)
+    ],
+    [GeneratedFormTextField('appName', label: tr('appName'), required: false)]
   ];
 
   // Previous 2 variables combined into one at runtime for convenient usage
@@ -334,13 +395,15 @@ class SourceProvider {
     Codeberg(),
     FDroid(),
     IzzyOnDroid(),
-    Mullvad(),
+    FDroidRepo(),
-    Signal(),
     SourceForge(),
     APKMirror(),
-    FDroidRepo(),
+    Mullvad(),
-    SteamMobile(),
+    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
   ];
@@ -352,7 +415,7 @@ class SourceProvider {
     url = preStandardizeUrl(url);
     AppSource? source;
     for (var s in sources.where((element) => element.host != null)) {
-      if (url.contains('://${s.host}')) {
+      if (RegExp('://(.+\\.)?${s.host}').hasMatch(url)) {
         source = s;
         break;
       }
@@ -411,14 +474,29 @@ class SourceProvider {
     if (additionalSettings['apkFilterRegEx'] != null) {
       var reg = RegExp(additionalSettings['apkFilterRegEx']);
       apk.apkUrls =
-          apk.apkUrls.where((element) => reg.hasMatch(element)).toList();
+          apk.apkUrls.where((element) => reg.hasMatch(element.key)).toList();
     }
     if (apk.apkUrls.isEmpty && !trackOnly) {
       throw NoAPKError();
     }
+    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;
+        }
+      }
+    }
     String apkVersion = apk.version.replaceAll('/', '-');
-    var name = currentApp?.name.trim() ??
+    var name = currentApp != null ? currentApp.name.trim() : '';
-        apk.names.name[0].toUpperCase() + apk.names.name.substring(1);
+    name = name.isNotEmpty
+        ? name
+        : apk.names.name[0].toUpperCase() + apk.names.name.substring(1);
     return App(
         currentApp?.id ??
             source.tryInferringAppId(standardUrl,
@@ -426,9 +504,7 @@ class SourceProvider {
             generateTempID(standardUrl, additionalSettings),
         standardUrl,
         apk.names.author[0].toUpperCase() + apk.names.author.substring(1),
-        name.trim().isNotEmpty
+        name,
-            ? name
-            : apk.names.name[0].toUpperCase() + apk.names.name.substring(1),
         currentApp?.installedVersion,
         apkVersion,
         apk.apkUrls,
@@ -437,16 +513,20 @@ class SourceProvider {
         DateTime.now(),
         currentApp?.pinned ?? false,
         categories: currentApp?.categories ?? const [],
-        releaseDate: apk.releaseDate);
+        releaseDate: apk.releaseDate,
+        changeLog: apk.changeLog);
   }
 
   // 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,

pubspec.lock

@@ -5,18 +5,18 @@ packages:
     dependency: "direct main"
     description:
       name: android_alarm_manager_plus
-      sha256: "8647cc5f9339f3955a2bd9ec40e0f10c3a80049f31f80b3ffdd87e07bb73fce2"
+      sha256: f6d0347734fa2ea716349a5a3e16ffdc1800ca64e5640112896d128c6815c178
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   android_intent_plus:
     dependency: "direct main"
     description:
       name: android_intent_plus
-      sha256: "54810cb33945c2c10742cd746ea994822c115e9dbe189919bc63cb436e45a6af"
+      sha256: "6bcdcd20461ac7a0c785f6298cdda96ad275d5bcbc1ecf28829cbe03ec6690be"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.6"
+    version: "3.1.7"
   animations:
     dependency: "direct main"
     description:
@@ -117,10 +117,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "1d6e5a61674ba3a68fb048a7c7b4ff4bebfed8d7379dbe8f2b718231be9a7c95"
+      sha256: "435383ca05f212760b0a70426b5a90354fe6bd65992b3a5e27ab6ede74c02f5c"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "8.2.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -133,10 +133,10 @@ packages:
     dependency: "direct main"
     description:
       name: dynamic_color
-      sha256: c4a508284b14ec4dda5adba2c28b2cdd34fbae1afead7e8c52cad87d51c5405b
+      sha256: bbebb1b7ebed819e0ec83d4abdc2a8482d934f6a85289ffc1c6acf7589fa2aad
       url: "https://pub.dev"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.3"
   easy_localization:
     dependency: "direct main"
     description:
@@ -181,10 +181,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: d8e9ca7e5d1983365c277f12c21b4362df6cf659c99af146ad4d04eb33033013
+      sha256: b85eb92b175767fdaa0c543bf3b0d1f610fe966412ea72845fe5ba7801e763ff
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.6"
+    version: "5.2.10"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -235,6 +235,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_markdown:
+    dependency: "direct main"
+    description:
+      name: flutter_markdown
+      sha256: "7b25c10de1fea883f3c4f9b8389506b54053cd00807beab69fd65c8653a2711f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.14"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -325,6 +333,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
+  markdown:
+    dependency: transitive
+    description:
+      name: markdown
+      sha256: d95a9d12954aafc97f984ca29baaa7690ed4d9ec4140a23ad40580bcdb6c87f5
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.2"
   matcher:
     dependency: transitive
     description:
@@ -393,26 +409,26 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: "04890b994ee89bfa80bf3080bfec40d5a92c5c7a785ebb02c13084a099d2b6f9"
+      sha256: c7edf82217d4b2952b2129a61d3ad60f1075b9299e629e149a8d2e39c2e6aad4
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.13"
+    version: "2.0.14"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7"
+      sha256: da97262be945a72270513700a92b39dd2f4a54dad55d061687e2e37a6390366a
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.24"
+    version: "2.0.25"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "12eee51abdf4d34c590f043f45073adbb45514a108bd9db4491547a2fd891059"
+      sha256: ad4c4d011830462633f03eb34445a45345673dfd4faf1ab0b4735fbd93b19183
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.2"
   path_provider_linux:
     dependency: transitive
     description:
@@ -457,10 +473,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: "9c370ef6a18b1c4b2f7f35944d644a56aa23576f23abee654cf73968de93f163"
+      sha256: ee96ac32f5a8e6f80756e25b25b9f8e535816c8e6665a96b6d70681f8c4f7e85
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.7"
+    version: "9.0.8"
   permission_handler_platform_interface:
     dependency: transitive
     description:
@@ -521,74 +537,74 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: "8c6892037b1824e2d7e8f59d54b3105932899008642e6372e5079c6939b4b625"
+      sha256: "692261968a494e47323dcc8bc66d8d52e81bc27cb4b808e4e8d7e8079d4cc01a"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: "82ddd4ab9260c295e6e39612d4ff00390b9a7a21f1bb1da771e2f232d80ab8a1"
+      sha256: "0c6e61471bd71b04a138b8b588fa388e66d8b005e6f2deda63371c5c505a0981"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: ee6257848f822b8481691f20c3e6d2bfee2e9eccb2a3d249907fcfb198c55b41
+      sha256: "858aaa72d8f61637d64e776aca82e1c67e6d9ee07979123c5d17115031c1b13b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.18"
+    version: "2.1.0"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: ad423a80fe7b4e48b50d6111b3ea1027af0e959e49d485712e134863d9c1c521
+      sha256: "7fa90471a6875d26ad78c7e4a675874b2043874586891128dc5899662c97db46"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.17"
+    version: "2.1.2"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "1e755f8583229f185cfca61b1d80fb2344c9d660e1c69ede5450d8f478fa5310"
+      sha256: "0c1c16c56c9708aa9c361541a6f0e5cc6fc12a3232d866a687a7b7db30032b07"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.2.1"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: "3a59ed10890a8409ad0faad7bb2957dab4b92b8fbe553257b05d30ed8af2c707"
+      sha256: "9d387433ca65717bbf1be88f4d5bb18f10508917a8fa2fb02e0fd0d7479a9afa"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.2.0"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: "824bfd02713e37603b2bdade0842e47d56e7db32b1dcdd1cae533fb88e2913fc"
+      sha256: fb5cf25c0235df2d0640ac1b1174f6466bd311f621574997ac59018a6664548d
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.2.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "0dc2633f215a3d4aa3184c9b2c5766f4711e4e5a6b256e62aafee41f89f1bfb8"
+      sha256: "74083203a8eae241e0de4a0d597dbedab3b8fef5563f33cf3c12d7e93c655ca5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.6"
+    version: "2.1.0"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: "71bcd669bb9cdb6b39f22c4a7728b6d49e934f6cba73157ffa5a54f1eed67436"
+      sha256: "5e588e2efef56916a3b229c3bfe81e6a525665a454519ca51dbcc4236a274173"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.2.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -606,18 +622,18 @@ packages:
     dependency: "direct main"
     description:
       name: sqflite
-      sha256: "500d6fec583d2c021f2d25a056d96654f910662c64f836cd2063167b8f1fa758"
+      sha256: e7dfb6482d5d02b661d0b2399efa72b98909e5aa7b8336e1fb37e226264ade00
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.6"
+    version: "2.2.7"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "963dad8c4aa2f814ce7d2d5b1da2f36f31bd1a439d8f27e3dc189bb9d26bc684"
+      sha256: "220831bf0bd5333ff2445eee35ec131553b804e6b5d47a4a37ca6f5eb66e282c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.3"
+    version: "2.4.4"
   stack_trace:
     dependency: transitive
     description:
@@ -646,10 +662,10 @@ packages:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b"
+      sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.1.0"
   term_glyph:
     dependency: transitive
     description:
@@ -670,10 +686,10 @@ packages:
     dependency: transitive
     description:
       name: timezone
-      sha256: "24c8fcdd49a805d95777a39064862133ff816ebfffe0ceff110fb5960e557964"
+      sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.1"
+    version: "0.9.2"
   typed_data:
     dependency: transitive
     description:
@@ -694,18 +710,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "845530e5e05db5500c1a4c1446785d60cbd8f9bd45e21e7dd643a3273bb4bbd1"
+      sha256: a52628068d282d01a07cd86e6ba99e497aa45ce8c91159015b2416907d78e411
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.25"
+    version: "6.0.27"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "7ab1e5b646623d6a2537aa59d5d039f90eebef75a7c25e105f6f75de1f7750c3"
+      sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.2"
+    version: "6.1.4"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -718,10 +734,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a"
+      sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.4"
+    version: "3.0.5"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -766,42 +782,42 @@ packages:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: b6cd42db3ced5411f3d01599906156885b18e4188f7065a8a351eb84bee347e0
+      sha256: "1a37bdbaaf5fbe09ad8579ab09ecfd473284ce482f900b5aea27cf834386a567"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "4.2.0"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "34f83c2f0f64c75ad75c77a2ccfc8d2e531afbe8ad41af1fd787d6d33336aa90"
+      sha256: "134ed5d36127b6f5865e86a82174886eae0b983dacd8df14b0448371debde755"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.3"
+    version: "3.6.0"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: "1939c39e2150fb4d30fd3cc59a891a49fed9935db53007df633ed83581b6117b"
+      sha256: "78715dc442b7849dbde74e92bb67de1cecf5addf95531c5fb474e72f5fe9a507"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.3.0"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: ab12479f7a0cf112b9420c36aaf206a1ca47cd60cd42de74a4be2e97a697587b
+      sha256: c94d242d8cbe1012c06ba7ac790c46d6e6b68723b7d34f8c74ed19f68d166f49
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.1"
+    version: "3.4.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
+      sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.4"
   xdg_directories:
     dependency: transitive
     description:
@@ -819,5 +835,5 @@ packages:
     source: hosted
     version: "6.2.2"
 sdks:
-  dart: ">=2.18.2 <3.0.0"
+  dart: ">=2.19.0 <3.0.0"
   flutter: ">=3.4.0-17.0.pre"

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.11.10+131 # When changing this, update the tag in main() accordingly
+version: 0.11.34+156 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'
@@ -49,7 +49,7 @@ dependencies:
   permission_handler: ^10.0.0
   fluttertoast: ^8.0.9
   device_info_plus: ^8.0.0
-  file_picker: ^5.1.0
+  file_picker: ^5.2.10
   animations: ^2.0.4
   install_plugin_v2: ^1.0.0
   share_plus: ^6.0.1
@@ -59,6 +59,7 @@ dependencies:
   sqflite: ^2.2.0+3
   easy_localization: ^3.0.1
   android_intent_plus: ^3.1.5
+  flutter_markdown: ^0.6.14
 
 
 dev_dependencies:
@@ -91,6 +92,7 @@ flutter:
   assets:
     - assets/translations/
     - assets/graphics/
+    - assets/ca/
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware