Debug builds (aaTest): Properly show version of Markor at 'More' page

gsantner · Nov 4, 2021 · 285d036 · 285d036
1 parent 95d4531
commit 285d036
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -44,7 +44,7 @@ android {
         flavorAtest {
             applicationId "net.gsantner.markor_test"
             versionCode = Integer.parseInt(new Date().format('yyMMdd'))
-            versionName = new Date().format('yyMMdd')
+            versionName = defaultConfig.versionName + "-" + new Date().format('HHmm')
             buildConfigField "boolean", "IS_TEST_BUILD", "true"
         }
         flavorDefault {

diff --git a/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java b/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java
@@ -211,11 +211,11 @@ public static String getAndroidVersion() {
     public String getAppVersionName() {
         PackageManager manager = _context.getPackageManager();
         try {
-            PackageInfo info = manager.getPackageInfo(getPackageIdManifest(), 0);
+            PackageInfo info = manager.getPackageInfo(getPackageIdReal(), 0);
             return info.versionName;
         } catch (PackageManager.NameNotFoundException e) {
             try {
-                PackageInfo info = manager.getPackageInfo(getPackageIdReal(), 0);
+                PackageInfo info = manager.getPackageInfo(getPackageIdManifest(), 0);
                 return info.versionName;
             } catch (PackageManager.NameNotFoundException ignored) {
             }
@@ -226,8 +226,12 @@ public String getAppVersionName() {
     public String getAppInstallationSource() {
         String src = null;
         try {
-            src = _context.getPackageManager().getInstallerPackageName(getPackageIdManifest());
+            src = _context.getPackageManager().getInstallerPackageName(getPackageIdReal());
         } catch (Exception ignored) {
+            try {
+                src = _context.getPackageManager().getInstallerPackageName(getPackageIdManifest());
+            } catch (Exception ignored2) {
+            }
         }
         if (src == null || src.trim().isEmpty()) {
             return "Sideloaded";