diff --git a/app/build.gradle b/app/build.gradle
index 75408f94c..3ad73dc97 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,6 +15,19 @@ tasks.withType(Test) {
systemProperty "GB_LOGFILES_DIR", Files.createTempDirectory("gblog").toString()
}
+def getGitHashShort = { ->
+ try {
+ def stdout = new ByteArrayOutputStream()
+ exec {
+ commandLine 'git', 'rev-parse', '--short', 'HEAD'
+ standardOutput = stdout
+ }
+ return stdout.toString().trim()
+ } catch (ignored){
+ return null
+ }
+}
+
android {
compileOptions {
// for KitKat
@@ -35,6 +48,7 @@ android {
versionCode 208
vectorDrawables.useSupportLibrary = true
multiDexEnabled true
+ buildConfigField "String", "GIT_HASH_SHORT", "\"${getGitHashShort()}\""
}
buildTypes {
release {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
index fcd0290d5..56a7ae3b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
@@ -31,8 +31,11 @@ public class AboutActivity extends AbstractGBActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about);
TextView about_version = findViewById(R.id.about_version);
+ TextView about_hash = findViewById(R.id.about_hash);
String versionName = BuildConfig.VERSION_NAME;
+ String versionHASH = BuildConfig.GIT_HASH_SHORT;
about_version.setText(String.format(getString(R.string.about_version), versionName));
+ about_hash.setText(String.format(getString(R.string.about_hash), versionHASH));
TextView link1 = findViewById(R.id.links1);
link1.setMovementMethod(LinkMovementMethod.getInstance());
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index fc442e051..a0817758e 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -53,6 +53,12 @@
android:id="@+id/about_version"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
+
+
+
F-Droid: https://f-droid.org/packages/nodomain.freeyourgadget.gadgetbridge/
About
Version %s
+ Commit %s
About Gadgetbridge
GPX Receiver Gadgetbridge
GPX file(s) received: