Allow versionCode to be used as the version for comparison (#1269)

assets/translations/bs.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Želite li ukloniti aplikaciju?",

assets/translations/cs.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Správce",
     "shizukuBinderNotFound": "Shizuku neběží",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Odstranit Apku?",

assets/translations/de.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku läuft nicht",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "App entfernen?",

assets/translations/en.json

@@ -289,6 +289,7 @@
     "shizukuBinderNotFound": "Сompatible Shizuku service wasn't found",
     "useSystemFont": "Use the system font",
     "systemFontError": "Error loading the system font: {}",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Remove App?",

assets/translations/es.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku no está operativo",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "¿Eliminar Aplicación?",

assets/translations/fa.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",

assets/translations/fr.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",

assets/translations/hu.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",

assets/translations/it.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku non è in esecuzione",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Rimuovere l'app?",

assets/translations/ja.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizukuが起動していません",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",

assets/translations/nl.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "App verwijderen?",

assets/translations/pl.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",

assets/translations/pt.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku não está rodando",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Remover aplicativo?",

assets/translations/ru.json

@@ -289,6 +289,7 @@
     "shizukuBinderNotFound": "Совместимый сервис Shizuku не найден",
     "useSystemFont": "Использовать системный шрифт",
     "systemFontError": "Ошибка загрузки системного шрифта: {}",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Удалить приложение?",

assets/translations/sv.json

@@ -273,6 +273,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Ta Bort App?",

assets/translations/tr.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Uygulamayı Kaldır?",

assets/translations/zh.json

@@ -289,6 +289,7 @@
     "shizukuBinderNotFound": "未发现兼容的 Shizuku 服务",
     "useSystemFont": "使用系统字体",
     "systemFontError": "加载系统字体出错：{}",
+    "useVersionCodeAsOSVersion": "Use app versionCode as OS-detected version",
     "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "是否删除应用？",

lib/providers/apps_provider.dart

@@ -798,13 +798,17 @@ class AppsProvider with ChangeNotifier {
             SourceProvider()
                 .getSource(app.app.url, overrideSource: app.app.overrideSource)
                 .naiveStandardVersionDetection;
+    String? realInstalledVersion =
+        app.app.additionalSettings['useVersionCodeAsOSVersion'] == true
+            ? app.installedInfo?.versionCode.toString()
+            : app.installedInfo?.versionName;
     return app.app.additionalSettings['trackOnly'] != true &&
         app.app.additionalSettings['versionDetection'] !=
             'releaseDateAsVersion' &&
-        app.installedInfo?.versionName != null &&
+        realInstalledVersion != null &&
         app.app.installedVersion != null &&
-        (reconcileVersionDifferences(app.installedInfo!.versionName!,
+        (reconcileVersionDifferences(
-                    app.app.installedVersion!) !=
+                    realInstalledVersion, app.app.installedVersion!) !=
                 null ||
             naiveStandardVersionDetection);
   }
@@ -823,30 +827,33 @@ class AppsProvider with ChangeNotifier {
             SourceProvider()
                 .getSource(app.url, overrideSource: app.overrideSource)
                 .naiveStandardVersionDetection;
+    String? realInstalledVersion =
+        app.additionalSettings['useVersionCodeAsOSVersion'] == true
+            ? installedInfo?.versionCode.toString()
+            : installedInfo?.versionName;
     // 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 &&
+    } else if (realInstalledVersion != null && app.installedVersion == null) {
-        app.installedVersion == null) {
+      // App says it's not installed but really is - set to installed and use real package versionName (or versionCode if chosen)
-      // App says it's not installed but really is - set to installed and use real package versionName
+      app.installedVersion = realInstalledVersion;
-      app.installedVersion = installedInfo!.versionName;
       modded = true;
     }
     // SECOND, RECONCILE DIFFERENCES BETWEEN THE APP'S REPORTED AND REAL INSTALLED VERSIONS, WHERE NEITHER IS NULL
-    if (installedInfo?.versionName != null &&
+    if (realInstalledVersion != null &&
-        installedInfo!.versionName != app.installedVersion &&
+        realInstalledVersion != app.installedVersion &&
         versionDetectionIsStandard) {
       // 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!);
+          realInstalledVersion, app.installedVersion!);
       if (correctedInstalledVersion?.key == false) {
         app.installedVersion = correctedInstalledVersion!.value;
         modded = true;
       } else if (naiveStandardVersionDetection) {
-        app.installedVersion = installedInfo.versionName;
+        app.installedVersion = realInstalledVersion;
         modded = true;
       }
     }
@@ -1291,8 +1298,11 @@ class AppsProvider with ChangeNotifier {
       await Future.delayed(const Duration(microseconds: 1));
     }
     for (App a in importedApps) {
+      var installedInfo = await getInstalledInfo(a.id, printErr: false);
       a.installedVersion =
-          (await getInstalledInfo(a.id, printErr: false))?.versionName;
+          a.additionalSettings['useVersionCodeAsOSVersion'] == true
+              ? installedInfo?.versionCode.toString()
+              : installedInfo?.versionName;
     }
     await saveApps(importedApps, onlyIfExists: false);
     notifyListeners();

lib/providers/source_provider.dart

@@ -485,6 +485,10 @@ abstract class AppSource {
           label: tr('versionDetection'),
           defaultValue: 'standardVersionDetection')
     ],
+    [
+      GeneratedFormSwitch('useVersionCodeAsOSVersion',
+          label: tr('useVersionCodeAsOSVersion'), defaultValue: false)
+    ],
     [
       GeneratedFormTextField('apkFilterRegEx',
           label: tr('filterAPKsByRegEx'),