From 285d0367ed22e12b5f497a27d11fcd981d157e0d Mon Sep 17 00:00:00 2001
From: Gregor Santner <gsantner@mailbox.org>
Date: Thu, 4 Nov 2021 19:15:13 +0100
Subject: [PATCH] Debug builds (aaTest): Properly show version of Markor at
 'More' page

---
 app/build.gradle                                       |  2 +-
 .../main/java/net/gsantner/opoc/util/ContextUtils.java | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e8d5d315cf..ac86b4676e 100644
--- 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
index 2a2ea83fea..cb6c50342d 100644
--- 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";