Merge pull request #451 from gidano/gidano/Obtainium-HU

Updated hu.json

assets/translations/de.json

@@ -207,6 +207,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,7 +221,8 @@
     "importFromURLsInFile": "Importieren von URLs aus Datei ( z.B. OPML)",
     "versionDetection": "Versionserkennung",
     "standardVersionDetection": "Standardversionserkennung",
-    "groupByCategory": "Group by Category",
+    "groupByCategory": "Nach Kategorie gruppieren",
+    "autoApkFilterByArch": "Nach Möglichkeit versuchen, APKs nach CPU-Architektur zu filtern",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "App entfernen?"

assets/translations/en.json

@@ -207,6 +207,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",
@@ -221,6 +222,7 @@
     "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

@@ -207,6 +207,7 @@
     "addCategory": "اضافه کردن دسته",
     "label": "برچسب",
     "language": "زبان",
+    "copiedToClipboard": "در کلیپ بورد کپی شد",
     "storagePermissionDenied": "مجوز ذخیره سازی رد شد",
     "selectedCategorizeWarning": "این جایگزین تنظیمات دسته بندی موجود برای برنامه های انتخابی می شود.",
     "filterAPKsByRegEx": "فایل‌های APK را با نظم فیلتر کنید",
@@ -220,7 +221,8 @@
     "importFromURLsInFile": "وارد کردن از آدرس های اینترنتی موجود در فایل (مانند OPML)",
     "versionDetection": "تشخیص نسخه",
     "standardVersionDetection": "تشخیص نسخه استاندارد",
-    "groupByCategory": "Group by Category",
+    "groupByCategory": "گروه بر اساس دسته",
+    "autoApkFilterByArch": "در صورت امکان سعی کنید APKها را بر اساس معماری CPU فیلتر کنید",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -207,6 +207,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",
@@ -221,6 +222,7 @@
     "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

@@ -206,6 +206,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,7 +220,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": "Group by Category",
+    "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

@@ -207,6 +207,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",
@@ -220,7 +221,8 @@
     "importFromURLsInFile": "Importa da URL in file (come OPML)",
     "versionDetection": "Rilevamento di versione",
     "standardVersionDetection": "Rilevamento di versione standard",
-    "groupByCategory": "Group by Category",
+    "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

@@ -207,6 +207,7 @@
     "addCategory": "カテゴリを追加",
     "label": "ラベル",
     "language": "言語",
+    "copiedToClipboard": "クリップボードにコピーしました",
     "storagePermissionDenied": "ストレージ権限が拒否されました",
     "selectedCategorizeWarning": "これにより、選択したアプリの既存のカテゴリ設定がすべて置き換えられます。",
     "filterAPKsByRegEx": "正規表現でAPKを絞り込む",
@@ -220,7 +221,8 @@
     "importFromURLsInFile": "ファイル（OPMLなど）内のURLからインポート",
     "versionDetection": "バージョン検出",
     "standardVersionDetection": "標準のバージョン検出",
-    "groupByCategory": "Group by Category",
+    "groupByCategory": "カテゴリ別にグループ化する",
+    "autoApkFilterByArch": "可能であれば，CPUアーキテクチャによるAPKのフィルタリングを試みる",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/zh.json

@@ -208,6 +208,7 @@
     "addCategory": "添加类别",
     "label": "标签",
     "language": "语言",
+    "copiedToClipboard": "Copied to Clipboard",
     "storagePermissionDenied": "存储权限已被拒绝",
     "selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
     "filterAPKsByRegEx": "Filter APKs by Regular Expression",
@@ -221,6 +222,7 @@
     "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

@@ -68,7 +68,7 @@ class Codeberg extends AppSource {
     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['name'] != null && e['browser_download_url'] != null
@@ -77,15 +77,15 @@ class Codeberg extends AppSource {
                     : const MapEntry('', '');
               })
               .where((element) => element.key.toLowerCase().endsWith('.apk'))
-              .map((e) => e.value)
               .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) {
@@ -119,7 +119,9 @@ class Codeberg extends AppSource {
         throw NoVersionError();
       }
       var changeLog = targetRelease['body'].toString();
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
+      return APKDetails(
+          version,
+          targetRelease['apkUrls'] as List<MapEntry<String, String>>,
           getAppNames(standardUrl),
           releaseDate: releaseDate,
           changeLog: changeLog.isEmpty ? null : changeLog);

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);
@@ -48,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);
@@ -61,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

@@ -127,10 +127,11 @@ class GitHub extends AppSource {
           [];
 
       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;
         }
         var nameToFilter = releases[i]['name'] as String?;
@@ -161,7 +162,9 @@ class GitHub extends AppSource {
         throw NoVersionError();
       }
       var changeLog = targetRelease['body'].toString();
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
+      return APKDetails(
+          version,
+          getApkUrlsFromUrls(targetRelease['apkUrls'] as List<String>),
           getAppNames(standardUrl),
           releaseDate: releaseDate,
           changeLog: changeLog.isEmpty ? null : changeLog);
@@ -185,9 +188,11 @@ class GitHub extends AppSource {
       Map<String, String> urlsWithDescriptions = {};
       for (var e in (jsonDecode(res.body)['items'] as List<dynamic>)) {
         urlsWithDescriptions.addAll({
-          e['html_url'] as String: e['description'] != null
+          e['html_url'] as String:
-              ? e['description'] as String
+              ((e['archived'] == true ? '[ARCHIVED] ' : '') +
-              : tr('noDescription')
+                  (e['description'] != null
+                      ? e['description'] as String
+                      : tr('noDescription')))
         });
       }
       return urlsWithDescriptions;

lib/app_sources/gitlab.dart

@@ -60,7 +60,8 @@ class GitLab extends AppSource {
       if (version == null) {
         throw NoVersionError();
       }
-      return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl),
+      return APKDetails(version, getApkUrlsFromUrls(apkUrls),
+          GitHub().getAppNames(standardUrl),
           releaseDate: releaseDate);
     } else {
       throw getObtainiumHttpError(res);

lib/app_sources/html.dart

@@ -34,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/mullvad.dart

@@ -1,7 +1,6 @@
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/app_sources/github.dart';
-import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
@@ -29,24 +28,41 @@ class Mullvad extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    var details = await HTML().getLatestAPKDetails(
+    Response res = await get(Uri.parse('$standardUrl/en/download/android'));
-        '$standardUrl/en/download/android', additionalSettings);
+    if (res.statusCode == 200) {
-    var fileName = details.apkUrls[0].split('/').last;
+      var versions = parse(res.body)
-    var versionMatch = RegExp('[0-9]+(\\.[0-9]+)+').firstMatch(fileName);
+          .querySelectorAll('p')
-    if (versionMatch == null) {
+          .map((e) => e.innerHtml)
-      throw NoVersionError();
+          .where((p) => p.contains('Latest version: '))
+          .map((e) {
+            var match = RegExp('[0-9]+(\\.[0-9]+)*').firstMatch(e);
+            if (match == null) {
+              return '';
+            } else {
+              return e.substring(match.start, match.end);
+            }
+          })
+          .where((element) => element.isNotEmpty)
+          .toList();
+      if (versions.isEmpty) {
+        throw NoVersionError();
+      }
+      String? changeLog;
+      try {
+        changeLog = (await GitHub().getLatestAPKDetails(
+                'https://github.com/mullvad/mullvadvpn-app',
+                {'fallbackToOlderReleases': true}))
+            .changeLog;
+      } catch (e) {
+        // Ignore
+      }
+      return APKDetails(
+          versions[0],
+          getApkUrlsFromUrls(['https://mullvad.net/download/app/apk/latest']),
+          AppNames(name, 'Mullvad-VPN'),
+          changeLog: changeLog);
+    } else {
+      throw getObtainiumHttpError(res);
     }
-    details.version = fileName.substring(versionMatch.start, versionMatch.end);
-    details.names = AppNames(name, 'Mullvad-VPN');
-    try {
-      details.changeLog = (await GitHub().getLatestAPKDetails(
-              'https://github.com/mullvad/mullvadvpn-app',
-              {'fallbackToOlderReleases': true}))
-          .changeLog;
-    } catch (e) {
-      print(e);
-      // Ignore
-    }
-    return details;
   }
 }

lib/app_sources/neutroncode.dart

@@ -98,7 +98,7 @@ class NeutronCode extends AppSource {
           ? (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,
           changeLog: changeLogElements.isNotEmpty

lib/app_sources/signal.dart

@@ -28,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

@@ -50,7 +50,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

@@ -53,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

@@ -32,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

@@ -54,7 +54,8 @@ class VLC extends AppSource {
         throw getObtainiumHttpError(res2);
       }
 
-      return APKDetails(version, apkUrls, AppNames('VideoLAN', 'VLC'));
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames('VideoLAN', 'VLC'));
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/whatsapp.dart

@@ -64,9 +64,9 @@ class WhatsApp extends AppSource {
           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

@@ -267,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) {

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

lib/pages/add_app.dart

@@ -334,11 +334,10 @@ class _AddAppPageState extends State<AddAppPage> {
           ],
         );
 
-    Widget getSourcesListWidget() => Expanded(
+    Widget getSourcesListWidget() => Column(
-            child: Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
-                mainAxisAlignment: MainAxisAlignment.center,
+            children: [
-                children: [
               const SizedBox(
                 height: 48,
               ),
@@ -365,16 +364,17 @@ class _AddAppPageState extends State<AddAppPage> {
                             fontStyle: FontStyle.italic),
                       )))
                   .toList()
-            ]));
+            ]);
 
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
-        body: CustomScrollView(slivers: <Widget>[
+        body: CustomScrollView(shrinkWrap: true, slivers: <Widget>[
           CustomAppBar(title: tr('addApp')),
-          SliverFillRemaining(
+          SliverToBoxAdapter(
             child: Padding(
                 padding: const EdgeInsets.all(16),
                 child: Column(
+                    mainAxisSize: MainAxisSize.min,
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
                       getUrlInputRow(),

lib/pages/app.dart

@@ -38,7 +38,7 @@ 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 (!areDownloadsRunning && prevApp == null && app != null) {
       prevApp = app;
@@ -61,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,
@@ -147,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,
             ),
@@ -380,7 +386,7 @@ class _AppPageState extends State<AppPage> {
                                       scrollable: true,
                                       content: getInfoColumn(),
                                       title: Text(
-                                          '${app.app.name} ${tr('byX', args: [
+                                          '${app.name} ${tr('byX', args: [
                                             app.app.author
                                           ])}'),
                                       actions: [

lib/pages/apps.dart

@@ -29,13 +29,13 @@ class AppsPageState extends State<AppsPage> {
   final AppsFilter neutralFilter = AppsFilter();
   var updatesOnlyFilter =
       AppsFilter(includeUptodate: false, includeNonInstalled: false);
-  Set<App> selectedApps = {};
+  Set<String> selectedAppIds = {};
   DateTime? refreshingSince;
 
   clearSelected() {
-    if (selectedApps.isNotEmpty) {
+    if (selectedAppIds.isNotEmpty) {
       setState(() {
-        selectedApps.clear();
+        selectedAppIds.clear();
       });
       return true;
     }
@@ -43,10 +43,10 @@ class AppsPageState extends State<AppsPage> {
   }
 
   selectThese(List<App> apps) {
-    if (selectedApps.isEmpty) {
+    if (selectedAppIds.isEmpty) {
       setState(() {
         for (var a in apps) {
-          selectedApps.add(a);
+          selectedAppIds.add(a.id);
         }
       });
     }
@@ -56,20 +56,21 @@ class AppsPageState extends State<AppsPage> {
   Widget build(BuildContext context) {
     var appsProvider = context.watch<AppsProvider>();
     var settingsProvider = context.watch<SettingsProvider>();
-    var listedApps = appsProvider.apps.values.toList();
+    var sourceProvider = SourceProvider();
+    var listedApps = appsProvider.getAppValues().toList();
     var currentFilterIsUpdatesOnly =
         filter.isIdenticalTo(updatesOnlyFilter, settingsProvider);
 
-    selectedApps = selectedApps
+    selectedAppIds = selectedAppIds
-        .where((element) => listedApps.map((e) => e.app).contains(element))
+        .where((element) => listedApps.map((e) => e.app.id).contains(element))
         .toSet();
 
     toggleAppSelected(App app) {
       setState(() {
-        if (selectedApps.contains(app)) {
+        if (selectedAppIds.map((e) => e).contains(app.id)) {
-          selectedApps.remove(app);
+          selectedAppIds.removeWhere((a) => a == app.id);
         } else {
-          selectedApps.add(app);
+          selectedAppIds.add(app.id);
         }
       });
     }
@@ -93,8 +94,7 @@ class AppsPageState extends State<AppsPage> {
             .toList();
 
         for (var t in nameTokens) {
-          var name = app.installedInfo?.name ?? app.app.name;
+          if (!app.name.toLowerCase().contains(t.toLowerCase())) {
-          if (!name.toLowerCase().contains(t.toLowerCase())) {
             return false;
           }
         }
@@ -110,17 +110,22 @@ class AppsPageState extends State<AppsPage> {
               .isEmpty) {
         return false;
       }
+      if (filter.sourceFilter.isNotEmpty &&
+          sourceProvider.getSource(app.app.url).runtimeType.toString() !=
+              filter.sourceFilter) {
+        return false;
+      }
       return true;
     }).toList();
 
     listedApps.sort((a, b) {
-      var nameA = a.installedInfo?.name ?? a.app.name;
-      var nameB = b.installedInfo?.name ?? b.app.name;
       int result = 0;
       if (settingsProvider.sortColumn == SortColumnSettings.authorName) {
-        result = (a.app.author + nameA).compareTo(b.app.author + nameB);
+        result = ((a.app.author + a.name).toLowerCase())
+            .compareTo((b.app.author + b.name).toLowerCase());
       } else if (settingsProvider.sortColumn == SortColumnSettings.nameAuthor) {
-        result = (nameA + a.app.author).compareTo(nameB + b.app.author);
+        result = ((a.name + a.app.author).toLowerCase())
+            .compareTo((b.name + b.app.author).toLowerCase());
       } else if (settingsProvider.sortColumn ==
           SortColumnSettings.releaseDate) {
         result = (a.app.releaseDate)?.compareTo(
@@ -137,15 +142,15 @@ class AppsPageState extends State<AppsPage> {
     var existingUpdates = appsProvider.findExistingUpdates(installedOnly: true);
 
     var existingUpdateIdsAllOrSelected = existingUpdates
-        .where((element) => selectedApps.isEmpty
+        .where((element) => selectedAppIds.isEmpty
             ? listedApps.where((a) => a.app.id == element).isNotEmpty
-            : selectedApps.map((e) => e.id).contains(element))
+            : selectedAppIds.map((e) => e).contains(element))
         .toList();
     var newInstallIdsAllOrSelected = appsProvider
         .findExistingUpdates(nonInstalledOnly: true)
-        .where((element) => selectedApps.isEmpty
+        .where((element) => selectedAppIds.isEmpty
             ? listedApps.where((a) => a.app.id == element).isNotEmpty
-            : selectedApps.map((e) => e.id).contains(element))
+            : selectedAppIds.map((e) => e).contains(element))
         .toList();
 
     List<String> trackOnlyUpdateIdsAllOrSelected = [];
@@ -200,12 +205,17 @@ class AppsPageState extends State<AppsPage> {
     var listedCategories = getListedCategories();
     listedCategories.sort((a, b) {
       return a != null && b != null
-          ? a.compareTo(b)
+          ? a.toLowerCase().compareTo(b.toLowerCase())
           : a == null
               ? 1
               : -1;
     });
 
+    Set<App> selectedApps = listedApps
+        .map((e) => e.app)
+        .where((a) => selectedAppIds.contains(a.id))
+        .toSet();
+
     showChangeLogDialog(
         String? changesUrl, AppSource appSource, String changeLog, int index) {
       showDialog(
@@ -282,7 +292,8 @@ class AppsPageState extends State<AppsPage> {
         if (refreshingSince != null)
           SliverToBoxAdapter(
             child: LinearProgressIndicator(
-              value: appsProvider.apps.values
+              value: appsProvider
+                      .getAppValues()
                       .where((element) => !(element.app.lastUpdateCheck
                               ?.isBefore(refreshingSince!) ??
                           true))
@@ -448,7 +459,8 @@ class AppsPageState extends State<AppsPage> {
                     .app
                     .categories
                     .map((e) =>
-                        Color(settingsProvider.categories[e]!).withAlpha(255))
+                        Color(settingsProvider.categories[e] ?? transparent)
+                            .withAlpha(255))
                     .toList(),
                 Color(transparent)
               ])),
@@ -460,15 +472,15 @@ class AppsPageState extends State<AppsPage> {
                 .colorScheme
                 .primary
                 .withOpacity(listedApps[index].app.pinned ? 0.2 : 0.1),
-            selected: selectedApps.contains(listedApps[index].app),
+            selected:
+                selectedAppIds.map((e) => e).contains(listedApps[index].app.id),
             onLongPress: () {
               toggleAppSelected(listedApps[index].app);
             },
             leading: getAppIcon(index),
             title: Text(
               maxLines: 1,
-              listedApps[index].installedInfo?.name ??
+              listedApps[index].name,
-                  listedApps[index].app.name,
               style: TextStyle(
                 overflow: TextOverflow.ellipsis,
                 fontWeight: listedApps[index].app.pinned
@@ -490,7 +502,7 @@ class AppsPageState extends State<AppsPage> {
                   ]))
                 : trailingRow,
             onTap: () {
-              if (selectedApps.isNotEmpty) {
+              if (selectedAppIds.isNotEmpty) {
                 toggleAppSelected(listedApps[index].app);
               } else {
                 Navigator.push(
@@ -527,7 +539,7 @@ class AppsPageState extends State<AppsPage> {
     }
 
     getSelectAllButton() {
-      return selectedApps.isEmpty
+      return selectedAppIds.isEmpty
           ? TextButton.icon(
               style: const ButtonStyle(visualDensity: VisualDensity.compact),
               onPressed: () {
@@ -541,17 +553,17 @@ class AppsPageState extends State<AppsPage> {
           : TextButton.icon(
               style: const ButtonStyle(visualDensity: VisualDensity.compact),
               onPressed: () {
-                selectedApps.isEmpty
+                selectedAppIds.isEmpty
                     ? selectThese(listedApps.map((e) => e.app).toList())
                     : clearSelected();
               },
               icon: Icon(
-                selectedApps.isEmpty
+                selectedAppIds.isEmpty
                     ? Icons.select_all_outlined
                     : Icons.deselect_outlined,
                 color: Theme.of(context).colorScheme.primary,
               ),
-              label: Text(selectedApps.length.toString()));
+              label: Text(selectedAppIds.length.toString()));
     }
 
     getMassObtainFunction() {
@@ -699,7 +711,7 @@ class AppsPageState extends State<AppsPage> {
           builder: (BuildContext ctx) {
             return AlertDialog(
               title: Text(tr('markXSelectedAppsAsUpdated',
-                  args: [selectedApps.length.toString()])),
+                  args: [selectedAppIds.length.toString()])),
               content: Text(
                 tr('onlyWorksWithNonVersionDetectApps'),
                 style: const TextStyle(
@@ -734,14 +746,12 @@ class AppsPageState extends State<AppsPage> {
     }
 
     pinSelectedApps() {
-      () {
+      var pinStatus = selectedApps.where((element) => element.pinned).isEmpty;
-        var pinStatus = selectedApps.where((element) => element.pinned).isEmpty;
+      appsProvider.saveApps(selectedApps.map((e) {
-        appsProvider.saveApps(selectedApps.map((e) {
+        e.pinned = pinStatus;
-          e.pinned = pinStatus;
+        return e;
-          return e;
+      }).toList());
-        }).toList());
+      Navigator.of(context).pop();
-        Navigator.of(context).pop();
-      };
     }
 
     resetSelectedAppsInstallStatuses() {
@@ -755,7 +765,7 @@ class AppsPageState extends State<AppsPage> {
                   items: const [],
                   initValid: true,
                   message: tr('installStatusOfXWillBeResetExplanation',
-                      args: [plural('app', selectedApps.length)]),
+                      args: [plural('app', selectedAppIds.length)]),
                 );
               });
           if (values != null) {
@@ -831,7 +841,7 @@ class AppsPageState extends State<AppsPage> {
         children: [
           IconButton(
             visualDensity: VisualDensity.compact,
-            onPressed: selectedApps.isEmpty
+            onPressed: selectedAppIds.isEmpty
                 ? null
                 : () {
                     appsProvider.removeAppsWithModal(
@@ -843,7 +853,7 @@ class AppsPageState extends State<AppsPage> {
           IconButton(
               visualDensity: VisualDensity.compact,
               onPressed: getMassObtainFunction(),
-              tooltip: selectedApps.isEmpty
+              tooltip: selectedAppIds.isEmpty
                   ? tr('installUpdateApps')
                   : tr('installUpdateSelectedApps'),
               icon: const Icon(
@@ -851,13 +861,13 @@ class AppsPageState extends State<AppsPage> {
               )),
           IconButton(
             visualDensity: VisualDensity.compact,
-            onPressed: selectedApps.isEmpty ? null : launchCategorizeDialog(),
+            onPressed: selectedAppIds.isEmpty ? null : launchCategorizeDialog(),
             tooltip: tr('categorize'),
             icon: const Icon(Icons.category_outlined),
           ),
           IconButton(
             visualDensity: VisualDensity.compact,
-            onPressed: selectedApps.isEmpty ? null : showMoreOptionsDialog,
+            onPressed: selectedAppIds.isEmpty ? null : showMoreOptionsDialog,
             tooltip: tr('more'),
             icon: const Icon(Icons.more_horiz),
           ),
@@ -893,6 +903,19 @@ class AppsPageState extends State<AppsPage> {
                   GeneratedFormSwitch('nonInstalledApps',
                       label: tr('nonInstalledApps'),
                       defaultValue: vals['nonInstalledApps'])
+                ],
+                [
+                  GeneratedFormDropdown(
+                      'sourceFilter',
+                      label: tr('appSource'),
+                      defaultValue: filter.sourceFilter,
+                      [
+                        MapEntry('', tr('none')),
+                        ...sourceProvider.sources
+                            .map((e) =>
+                                MapEntry(e.runtimeType.toString(), e.name))
+                            .toList()
+                      ])
                 ]
               ],
               additionalWidgets: [
@@ -1016,20 +1039,23 @@ class AppsFilter {
   late bool includeUptodate;
   late bool includeNonInstalled;
   late Set<String> categoryFilter;
+  late String sourceFilter;
 
   AppsFilter(
       {this.nameFilter = '',
       this.authorFilter = '',
       this.includeUptodate = true,
       this.includeNonInstalled = true,
-      this.categoryFilter = const {}});
+      this.categoryFilter = const {},
+      this.sourceFilter = ''});
 
   Map<String, dynamic> toFormValuesMap() {
     return {
       'appName': nameFilter,
       'author': authorFilter,
       'upToDateApps': includeUptodate,
-      'nonInstalledApps': includeNonInstalled
+      'nonInstalledApps': includeNonInstalled,
+      'sourceFilter': sourceFilter
     };
   }
 
@@ -1038,6 +1064,7 @@ class AppsFilter {
     authorFilter = values['author']!;
     includeUptodate = values['upToDateApps'];
     includeNonInstalled = values['nonInstalledApps'];
+    sourceFilter = values['sourceFilter'];
   }
 
   bool isIdenticalTo(AppsFilter other, SettingsProvider settingsProvider) =>
@@ -1045,5 +1072,6 @@ class AppsFilter {
       nameFilter.trim() == other.nameFilter.trim() &&
       includeUptodate == other.includeUptodate &&
       includeNonInstalled == other.includeNonInstalled &&
-      settingsProvider.setEqual(categoryFilter, other.categoryFilter);
+      settingsProvider.setEqual(categoryFilter, other.categoryFilter) &&
+      sourceFilter.trim() == other.sourceFilter.trim();
 }

lib/pages/import_export.dart

@@ -133,7 +133,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                 }
               }
             });
-            settingsProvider.categories = cats;
+            appsProvider.addMissingCategories(settingsProvider);
             showError(tr('importedX', args: [plural('apps', value)]), context);
           });
         } else {

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';
@@ -444,6 +445,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,
@@ -467,8 +469,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 {
@@ -97,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();
@@ -159,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 =
@@ -180,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);
         }
@@ -205,7 +210,7 @@ class AppsProvider with ChangeNotifier {
         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]);
@@ -296,9 +301,10 @@ 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];
     // get device supported architecture
     List<String> archs = (await DeviceInfoPlugin().androidInfo).supportedAbis;
 
@@ -321,14 +327,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;
@@ -353,7 +359,7 @@ 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);
@@ -637,7 +643,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) {
@@ -667,7 +673,8 @@ class AppsProvider with ChangeNotifier {
       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) {
@@ -757,6 +764,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();
@@ -836,12 +855,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();
@@ -850,6 +863,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(
@@ -902,7 +927,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
@@ -910,7 +935,7 @@ class APKPicker extends StatefulWidget {
 }
 
 class _APKPickerState extends State<APKPicker> {
-  String? apkUrl;
+  MapEntry<String, String>? apkUrl;
 
   @override
   Widget build(BuildContext context) {
@@ -919,19 +944,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';
 
@@ -160,7 +162,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';
@@ -34,7 +35,7 @@ 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;
@@ -50,7 +51,7 @@ 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;
@@ -79,6 +80,31 @@ class App {
     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
@@ -134,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,
@@ -143,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
@@ -173,7 +214,7 @@ 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,
@@ -225,6 +266,11 @@ Map<String, dynamic> getDefaultValuesFromFormItems(
       .reduce((value, element) => [...value, ...element]));
 }
 
+getApkUrlsFromUrls(List<String> urls) => urls
+    .map((e) =>
+        MapEntry(e.split('/').where((el) => el.trim().isNotEmpty).last, e))
+    .toList();
+
 class AppSource {
   String? host;
   late String name;
@@ -278,7 +324,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
@@ -362,7 +413,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;
       }
@@ -421,14 +472,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,
@@ -436,9 +502,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,

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: dd328189f2f4ccea042bb5b382d5e981691cc74b5a3429b9317bff2b19704489
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.6"
+    version: "5.2.8"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -337,10 +337,10 @@ packages:
     dependency: transitive
     description:
       name: markdown
-      sha256: b3c60dee8c2af50ad0e6e90cceba98e47718a6ee0a7a6772c77846a0cc21f78b
+      sha256: d95a9d12954aafc97f984ca29baaa7690ed4d9ec4140a23ad40580bcdb6c87f5
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.1"
+    version: "7.0.2"
   matcher:
     dependency: transitive
     description:
@@ -425,10 +425,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "818b2dc38b0f178e0ea3f7cf3b28146faab11375985d815942a68eee11c2d0f7"
+      sha256: ad4c4d011830462633f03eb34445a45345673dfd4faf1ab0b4735fbd93b19183
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
   path_provider_linux:
     dependency: transitive
     description:
@@ -537,50 +537,50 @@ 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: "78528fd87d0d08ffd3e69551173c026e8eacc7b7079c82eb6a77413957b7e394"
+      sha256: "858aaa72d8f61637d64e776aca82e1c67e6d9ee07979123c5d17115031c1b13b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.20"
+    version: "2.1.0"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: ad423a80fe7b4e48b50d6111b3ea1027af0e959e49d485712e134863d9c1c521
+      sha256: "8304d8a1f7d21a429f91dee552792249362b68a331ac5c3c1caf370f658873f6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.17"
+    version: "2.1.0"
   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:
@@ -593,18 +593,18 @@ packages:
     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
@@ -710,18 +710,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: dd729390aa936bf1bdf5cd1bc7468ff340263f80a2c4f569416507667de8e3c8
+      sha256: a52628068d282d01a07cd86e6ba99e497aa45ce8c91159015b2416907d78e411
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.26"
+    version: "6.0.27"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "3dedc66ca3c0bef9e6a93c0999aee102556a450afcc1b7bcfeace7a424927d92"
+      sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.3"
+    version: "6.1.4"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -734,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:
@@ -790,34 +790,34 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "34f83c2f0f64c75ad75c77a2ccfc8d2e531afbe8ad41af1fd787d6d33336aa90"
+      sha256: "5906c9aa8c88ed372b2ad3c88c942790b4fb16f73fdd1c0647b4d747d9cf5b3f"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.3"
+    version: "3.4.5"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: "1939c39e2150fb4d30fd3cc59a891a49fed9935db53007df633ed83581b6117b"
+      sha256: "6341f92977609be71391f4d4dcd64bfaa8ac657af1dfb2e231b5c1724e8c6c36"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: d601aba11ad8d4481e17a34a76fa1d30dee92dcbbe2c58b0df3120e9453099c7
+      sha256: "9a78d963cce191dd6a9df547301fc5c008bf3dae95a323ec281fff1284e0a037"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.3"
+    version: "3.2.4"
   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:
@@ -835,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.17+139 # When changing this, update the tag in main() accordingly
+version: 0.11.30+152 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'