Unified version detection setting

assets/translations/de.json

@@ -213,11 +213,13 @@
     "removeFromObtainium": "Aus Obtainium entfernen",
     "uninstallFromDevice": "Vom Gerät deinstallieren",
     "onlyWorksWithNonVersionDetectApps": "Funktioniert nur bei Apps mit deaktivierter Versionserkennung.",
-    "useReleaseDateAsVersion": "Veröffentlichungsdatum als Version verwenden",
+    "releaseDateAsVersion": "Veröffentlichungsdatum als Version verwenden",
     "releaseDateAsVersionExplanation": "Diese Option sollte nur für Apps verwendet werden, bei denen die Versionserkennung nicht korrekt funktioniert, aber ein Veröffentlichungsdatum verfügbar ist.",
     "changes": "Änderungen",
     "releaseDate": "Veröffentlichungsdatum",
     "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "versionDetection": "Version Detection",
+    "standardVersionDetection": "Standard version detection",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "App entfernen?"

assets/translations/en.json

@@ -213,11 +213,13 @@
     "removeFromObtainium": "Remove from Obtainium",
     "uninstallFromDevice": "Uninstall from Device",
     "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
-    "useReleaseDateAsVersion": "Use Release Date as Version",
+    "releaseDateAsVersion": "Use Release Date as Version",
     "releaseDateAsVersionExplanation": "This option should only be used for Apps where version detection does not work correctly, but a release date is available.",
     "changes": "Changes",
     "releaseDate": "Release Date",
     "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "versionDetection": "Version Detection",
+    "standardVersionDetection": "Standard version detection",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/fa.json

@@ -213,11 +213,13 @@
     "removeFromObtainium": "از Obtainium حذف کنید",
     "uninstallFromDevice": "حذف نصب از دستگاه",
     "onlyWorksWithNonVersionDetectApps": "فقط برای برنامه‌هایی کار می‌کند که تشخیص نسخه غیرفعال است.",
-    "useReleaseDateAsVersion": "Use Release Date as Version",
+    "releaseDateAsVersion": "Use Release Date as Version",
     "releaseDateAsVersionExplanation": "This option should only be used for Apps where version detection does not work correctly, but a release date is available.",
     "changes": "Changes",
     "releaseDate": "Release Date",
     "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "versionDetection": "Version Detection",
+    "standardVersionDetection": "Standard version detection",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/hu.json

@@ -212,11 +212,13 @@
     "removeFromObtainium": "Eltávolítás az Obtainiumból",
     "uninstallFromDevice": "Eltávolítás a készülékről",
     "onlyWorksWithNonVersionDetectApps": "Csak azoknál az alkalmazásoknál működik, amelyeknél a verzióérzékelés le van tiltva.",
-    "useReleaseDateAsVersion": "Használja a Kiadás dátumát, mint verziót",
+    "releaseDateAsVersion": "Használja a Kiadás dátumát, mint verziót",
     "releaseDateAsVersionExplanation": "Ezt a beállítást csak olyan alkalmazásoknál szabad használni, ahol a verzió érzékelése nem működik megfelelően, de elérhető a kiadás dátuma.",
     "changes": "Változtatások",
     "releaseDate": "Kiadás dátuma",
     "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "versionDetection": "Version Detection",
+    "standardVersionDetection": "Standard version detection",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -213,11 +213,13 @@
     "removeFromObtainium": "Rimuovi da Obtainium",
     "uninstallFromDevice": "Disinstalla dal dispositivo",
     "onlyWorksWithNonVersionDetectApps": "Funziona solo per le App con il rilevamento della versione disattivato.",
-    "useReleaseDateAsVersion": "Usa data di rilascio come versione",
+    "releaseDateAsVersion": "Usa data di rilascio come versione",
     "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)",
+    "versionDetection": "Version Detection",
+    "standardVersionDetection": "Standard version detection",
     "removeAppQuestion": {
         "one": "Rimuovere l'App?",
         "other": "Rimuovere le App?"

assets/translations/ja.json

@@ -213,11 +213,13 @@
     "removeFromObtainium": "Obtainiumから削除する",
     "uninstallFromDevice": "デバイスからアンインストールする",
     "onlyWorksWithNonVersionDetectApps": "バージョン検出を無効にしているアプリにのみ動作します。",
-    "useReleaseDateAsVersion": "リリース日をバージョンとして使用する",
+    "releaseDateAsVersion": "リリース日をバージョンとして使用する",
     "releaseDateAsVersionExplanation": "このオプションは、バージョン検出が正しく機能しないアプリで、リリース日が利用可能な場合にのみ使用する必要があります。",
     "changes": "変更点",
     "releaseDate": "リリース日",
     "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "versionDetection": "Version Detection",
+    "standardVersionDetection": "Standard version detection",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/zh.json

@@ -213,11 +213,13 @@
     "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "removeFromObtainium": "Remove from Obtainium",
     "uninstallFromDevice": "Uninstall from Device",
-    "useReleaseDateAsVersion": "Use Release Date as Version",
+    "releaseDateAsVersion": "Use Release Date as Version",
     "releaseDateAsVersionExplanation": "This option should only be used for Apps where version detection does not work correctly, but a release date is available.",
     "changes": "Changes",
     "releaseDate": "Release Date",
     "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "versionDetection": "Version Detection",
+    "standardVersionDetection": "Standard version detection",
     "removeAppQuestion": {
         "one": "删除应用？",
         "other": "删除应用？"

lib/pages/add_app.dart

@@ -71,10 +71,6 @@ class _AddAppPageState extends State<AddAppPage> {
       var settingsProvider = context.read<SettingsProvider>();
       () async {
         var userPickedTrackOnly = additionalSettings['trackOnly'] == true;
-        var userPickedNoVersionDetection =
-            additionalSettings['noVersionDetection'] == true;
-        var userPickedReleaseDateAsVersion =
-            additionalSettings['releaseDateAsVersion'] == true;
         var cont = true;
         if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
             // ignore: use_build_context_synchronously
@@ -95,13 +91,13 @@ class _AddAppPageState extends State<AddAppPage> {
                 null) {
           cont = false;
         }
-        if (userPickedReleaseDateAsVersion && // ignore: use_build_context_synchronously
+        if (additionalSettings['versionDetection'] == 'releaseDateAsVersion' &&
             // ignore: use_build_context_synchronously
             await showDialog(
                     context: context,
                     builder: (BuildContext ctx) {
                       return GeneratedFormModal(
-                        title: tr('useReleaseDateAsVersion'),
+                        title: tr('releaseDateAsVersion'),
                         items: const [],
                         message: tr('releaseDateAsVersionExplanation'),
                       );
@@ -109,8 +105,7 @@ class _AddAppPageState extends State<AddAppPage> {
                 null) {
           cont = false;
         }
-        if (!userPickedReleaseDateAsVersion &&
+        if (additionalSettings['versionDetection'] == 'noVersionDetection' &&
-            userPickedNoVersionDetection &&
             // ignore: use_build_context_synchronously
             await showDialog(
                     context: context,
@@ -129,9 +124,7 @@ class _AddAppPageState extends State<AddAppPage> {
           var trackOnly = pickedSource!.enforceTrackOnly || userPickedTrackOnly;
           App app = await sourceProvider.getApp(
               pickedSource!, userInput, additionalSettings,
-              trackOnlyOverride: trackOnly,
+              trackOnlyOverride: trackOnly);
-              noVersionDetectionOverride: userPickedNoVersionDetection,
-              releaseDateAsVersionOverride: userPickedReleaseDateAsVersion);
           if (!trackOnly) {
             await settingsProvider.getInstallPermission();
           }

lib/pages/app.dart

@@ -42,8 +42,6 @@ class _AppPageState extends State<AppPage> {
       getUpdate(app.app.id);
     }
     var trackOnly = app?.app.additionalSettings['trackOnly'] == true;
-    var noVersionDetection =
-        app?.app.additionalSettings['noVersionDetection'] == true;
 
     var infoColumn = Column(
       mainAxisAlignment: MainAxisAlignment.center,
@@ -207,7 +205,8 @@ class _AppPageState extends State<AppPage> {
                   child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: [
-                        if (noVersionDetection &&
+                        if (app?.app.additionalSettings['versionDetection'] !=
+                                'standardVersionDetection' &&
                             !trackOnly &&
                             app?.app.installedVersion != null &&
                             app?.app.installedVersion != app?.app.latestVersion)
@@ -295,13 +294,11 @@ class _AppPageState extends State<AppPage> {
                                                 context);
                                           }
                                           if (app.app.additionalSettings[
-                                                  'releaseDateAsVersion'] ==
+                                                  'versionDetection'] ==
-                                              true) {
+                                              'releaseDateAsVersion') {
-                                            app.app.additionalSettings[
-                                                'noVersionDetection'] = true;
                                             if (originalSettings[
-                                                    'releaseDateAsVersion'] !=
+                                                    'versionDetection'] !=
-                                                true) {
+                                                'releaseDateAsVersion') {
                                               if (app.app.releaseDate != null) {
                                                 bool isUpdated =
                                                     app.app.installedVersion ==
@@ -318,10 +315,8 @@ class _AppPageState extends State<AppPage> {
                                               }
                                             }
                                           } else if (originalSettings[
-                                                  'releaseDateAsVersion'] ==
+                                                  'versionDetection'] ==
-                                              true) {
+                                              'releaseDateAsVersion') {
-                                            app.app.additionalSettings[
-                                                'noVersionDetection'] = false;
                                             app.app.installedVersion = app
                                                     .installedInfo
                                                     ?.versionName ??

lib/pages/apps.dart

@@ -704,7 +704,7 @@ class AppsPageState extends State<AppsPage> {
                                                                                   onPressed: () {
                                                                                     HapticFeedback.selectionClick();
                                                                                     appsProvider.saveApps(selectedApps.map((a) {
-                                                                                      if (a.installedVersion != null && a.additionalSettings['noVersionDetection'] == true) {
+                                                                                      if (a.installedVersion != null && a.additionalSettings['versionDetection'] != 'standardVersionDetection') {
                                                                                         a.installedVersion = a.latestVersion;
                                                                                       }
                                                                                       return a;

lib/providers/apps_provider.dart

@@ -467,8 +467,8 @@ class AppsProvider with ChangeNotifier {
   App? getCorrectedInstallStatusAppIfPossible(App app, AppInfo? installedInfo) {
     var modded = false;
     var trackOnly = app.additionalSettings['trackOnly'] == true;
-    var noVersionDetection =
+    var noVersionDetection = app.additionalSettings['versionDetection'] !=
-        app.additionalSettings['noVersionDetection'] == true;
+        'standardVersionDetection';
     if (installedInfo == null && app.installedVersion != null && !trackOnly) {
       app.installedVersion = null;
       modded = true;

lib/providers/source_provider.dart

@@ -100,6 +100,20 @@ class App {
       additionalSettings['noVersionDetection'] =
           json['noVersionDetection'] == 'true' || json['trackOnly'] == true;
     }
+    // Convert bool style version detection options to dropdown style
+    if (additionalSettings['noVersionDetection'] == true) {
+      additionalSettings['versionDetection'] = 'noVersionDetection';
+    }
+    if (additionalSettings['releaseDateAsVersion'] == true) {
+      additionalSettings['versionDetection'] = 'releaseDateAsVersion';
+      additionalSettings.remove('releaseDateAsVersion');
+    }
+    if (additionalSettings['noVersionDetection'] != null) {
+      additionalSettings.remove('noVersionDetection');
+    }
+    if (additionalSettings['releaseDateAsVersion'] != null) {
+      additionalSettings.remove('releaseDateAsVersion');
+    }
     // Ensure additionalSettings are correctly typed
     for (var item in formItems) {
       if (additionalSettings[item.key] != null) {
@@ -234,11 +248,16 @@ class AppSource {
       )
     ],
     [
-      GeneratedFormSwitch('releaseDateAsVersion',
+      GeneratedFormDropdown(
-          label: tr('useReleaseDateAsVersion'))
+          'versionDetection',
-    ],
+          [
-    [
+            MapEntry(
-      GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))
+                'standardVersionDetection', tr('standardVersionDetection')),
+            MapEntry('releaseDateAsVersion', tr('releaseDateAsVersion')),
+            MapEntry('noVersionDetection', tr('noVersionDetection'))
+          ],
+          label: tr('versionDetection'),
+          defaultValue: 'standardVersionDetection')
     ],
     [
       GeneratedFormTextField('apkFilterRegEx',
@@ -373,26 +392,15 @@ class SourceProvider {
 
   Future<App> getApp(
       AppSource source, String url, Map<String, dynamic> additionalSettings,
-      {App? currentApp,
+      {App? currentApp, bool trackOnlyOverride = false}) async {
-      bool trackOnlyOverride = false,
-      bool noVersionDetectionOverride = false,
-      bool releaseDateAsVersionOverride = false}) async {
     if (trackOnlyOverride || source.enforceTrackOnly) {
       additionalSettings['trackOnly'] = true;
     }
-    if (releaseDateAsVersionOverride) {
-      additionalSettings['releaseDateAsVersion'] = true;
-      noVersionDetectionOverride =
-          true; // Rel. date as version means no ver. det.
-    }
-    if (noVersionDetectionOverride) {
-      additionalSettings['noVersionDetection'] = true;
-    }
     var trackOnly = additionalSettings['trackOnly'] == true;
     String standardUrl = source.standardizeURL(preStandardizeUrl(url));
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalSettings);
-    if (additionalSettings['releaseDateAsVersion'] == true &&
+    if (additionalSettings['versionDetection'] == 'releaseDateAsVersion' &&
         apk.releaseDate != null) {
       apk.version = apk.releaseDate!.microsecondsSinceEpoch.toString();
     }