From c551a38a8bebdd7e728be59c17806fd1d30c4da3 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Mon, 2 Sep 2019 16:05:24 +0200
Subject: [PATCH] Show full version name based upon `git describe --tags` on
 startup and also in AboutActivity.

---
 build.gradle                                                 | 3 ++-
 src/main/java/de/dennisguse/opentracks/Startup.java          | 2 +-
 src/main/java/de/dennisguse/opentracks/util/SystemUtils.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0f1a1fab8..12e168984 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,7 +52,8 @@ android {
         applicationId "de.dennisguse.opentracks"
         //Useful for debugging.
         //versionCode getVersionCode()
-        //versionName getVersionName()
+
+        buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
         minSdkVersion 21
         targetSdkVersion 29
diff --git a/src/main/java/de/dennisguse/opentracks/Startup.java b/src/main/java/de/dennisguse/opentracks/Startup.java
index 226e590b1..58d67a367 100644
--- a/src/main/java/de/dennisguse/opentracks/Startup.java
+++ b/src/main/java/de/dennisguse/opentracks/Startup.java
@@ -15,7 +15,7 @@ public class Startup extends Application {
         super.onCreate();
 
         //Include version information into stack traces.
-        Log.i(TAG, BuildConfig.APPLICATION_ID + "; BuildType: " + BuildConfig.BUILD_TYPE + "; VersionName: " + BuildConfig.VERSION_NAME + " VersionCode: " + BuildConfig.VERSION_CODE);
+        Log.i(TAG, BuildConfig.APPLICATION_ID + "; BuildType: " + BuildConfig.BUILD_TYPE + "; VersionName: " + BuildConfig.VERSION_NAME + "/" + BuildConfig.VERSION_NAME_FULL + " VersionCode: " + BuildConfig.VERSION_CODE);
 
         //Set default values of preferences on first start.
         PreferencesUtils.resetPreferences(this, false);
diff --git a/src/main/java/de/dennisguse/opentracks/util/SystemUtils.java b/src/main/java/de/dennisguse/opentracks/util/SystemUtils.java
index e896e71ba..977c8f9fc 100644
--- a/src/main/java/de/dennisguse/opentracks/util/SystemUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/SystemUtils.java
@@ -49,7 +49,7 @@ public class SystemUtils {
     public static String getAppVersionName(Context context) {
         try {
             PackageInfo pi = context.getPackageManager().getPackageInfo(BuildConfig.APPLICATION_ID, PackageManager.GET_META_DATA);
-            return pi.versionName;
+            return pi.versionName + "/" + BuildConfig.VERSION_NAME_FULL;
         } catch (NameNotFoundException e) {
             Log.w(TAG, "Failed to get version info.", e);
             return "";