Merge pull request #195 from alexbakker/about-version-git

Add git commit hash and branch information to AboutActivity for debug builds

app/build.gradle

@@ -1,5 +1,17 @@
 apply plugin: 'com.android.application'
 
+def getCmdOutput = { cmd ->
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine cmd
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
+def getGitHash = { -> return getCmdOutput(["git", "rev-parse", "--short", "HEAD"]) }
+def getGitBranch = { -> return getCmdOutput(["git", "rev-parse", "--abbrev-ref", "HEAD"]) }
+
 android {
     compileSdkVersion 28
 
@@ -9,6 +21,8 @@ android {
         targetSdkVersion 28
         versionCode 21
         versionName "1.0.2"
+        buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
+        buildConfigField "String", "GIT_BRANCH", "\"${getGitBranch()}\""
     }
 
     lintOptions {
@@ -80,5 +94,4 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2'
-
 }

app/src/main/java/com/beemdevelopment/aegis/ui/AboutActivity.java

@@ -1,15 +1,16 @@
 package com.beemdevelopment.aegis.ui;
 
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
 
-import com.beemdevelopment.aegis.Preferences;
+import com.beemdevelopment.aegis.BuildConfig;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.Theme;
 import com.beemdevelopment.aegis.helpers.ThemeHelper;
@@ -18,11 +19,11 @@ import com.mikepenz.iconics.Iconics;
 import com.mikepenz.iconics.context.IconicsLayoutInflater2;
 import com.mikepenz.material_design_iconic_typeface_library.MaterialDesignIconic;
 
+import androidx.annotation.StringRes;
 import androidx.core.view.LayoutInflaterCompat;
 
 import de.psdev.licensesdialog.LicenseResolver;
 import de.psdev.licensesdialog.LicensesDialog;
-import de.psdev.licensesdialog.licenses.License;
 
 public class AboutActivity extends AegisActivity {
 
@@ -48,7 +49,12 @@ public class AboutActivity extends AegisActivity {
         btnLicenses.setOnClickListener(v -> showLicenseDialog());
 
         TextView appVersion = findViewById(R.id.app_version);
-        appVersion.setText(getCurrentVersion());
+        appVersion.setText(getCurrentAppVersion());
+
+        View btnAppVersion = findViewById(R.id.btn_app_version);
+        btnAppVersion.setOnClickListener(v -> {
+            copyToClipboard(getCurrentAppVersion(), R.string.version_copied);
+        });
 
         View btnGithub = findViewById(R.id.btn_github);
         btnGithub.setOnClickListener(v -> openUrl(GITHUB));
@@ -74,13 +80,12 @@ public class AboutActivity extends AegisActivity {
         });
     }
 
-    private String getCurrentVersion() {
-        try {
-            return getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
+    private static String getCurrentAppVersion() {
+        if (BuildConfig.DEBUG) {
+            return String.format("%s-%s (%s)", BuildConfig.VERSION_NAME, BuildConfig.GIT_HASH, BuildConfig.GIT_BRANCH);
         }
-        return "Unknown version";
+
+        return BuildConfig.VERSION_NAME;
     }
 
     private void openUrl(String url) {
@@ -91,6 +96,13 @@ public class AboutActivity extends AegisActivity {
         startActivity(browserIntent);
     }
 
+    private void copyToClipboard(String text, @StringRes int messageId) {
+        ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+        ClipData data = ClipData.newPlainText("text/plain", text);
+        clipboard.setPrimaryClip(data);
+        Toast.makeText(this, messageId, Toast.LENGTH_SHORT).show();
+    }
+
     private void openMail(String mailaddress) {
         Intent mailIntent = new Intent(Intent.ACTION_SENDTO);
         mailIntent.setData(Uri.parse("mailto:" + mailaddress));

app/src/main/res/layout/content_about.xml

@@ -67,6 +67,7 @@
                     app:ico_size="16dp" />
 
                 <LinearLayout
+                    android:id="@+id/btn_app_version"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="32dp"

app/src/main/res/values/strings.xml

@@ -105,6 +105,7 @@
     <string name="vault_not_found">Vault not found, starting setup…</string>
     <string name="code_copied">Code copied to the clipboard</string>
     <string name="errors_copied">Errors copied to the clipboard</string>
+    <string name="version_copied">Version copied to the clipboard</string>
     <string name="decryption_error">An error occurred while trying to unlock the vault</string>
     <string name="saving_error">An error occurred while trying to save the vault</string>
     <string name="disable_encryption">Disable encryption</string>