From ebc0386826bb3f47b4d35ae31322be523b23eb9a Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Mon, 20 Apr 2020 16:57:03 +0200
Subject: Add build timestamp to beta flavor

---
 app/build.gradle                                              |  1 +
 app/src/main/java/se/lublin/mumla/preference/Preferences.java | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e7676a9..bf25356 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -66,6 +66,7 @@ android {
         versionName gitDescribe()
 
         setProperty("archivesBaseName", "mumla")
+        buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
 
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
     }
diff --git a/app/src/main/java/se/lublin/mumla/preference/Preferences.java b/app/src/main/java/se/lublin/mumla/preference/Preferences.java
index a9b5450..d632f54 100644
--- a/app/src/main/java/se/lublin/mumla/preference/Preferences.java
+++ b/app/src/main/java/se/lublin/mumla/preference/Preferences.java
@@ -17,6 +17,7 @@
 
 package se.lublin.mumla.preference;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -32,7 +33,10 @@ import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 import info.guardianproject.netcipher.proxy.OrbotHelper;
 import se.lublin.mumla.BuildConfig;
@@ -130,7 +134,11 @@ public class Preferences extends PreferenceActivity {
             PackageInfo info = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
             version = info.versionName;
             if (BuildConfig.FLAVOR.equals("beta")) {
-                version += ("\nBeta versioncode: " + info.versionCode);
+                @SuppressLint("SimpleDateFormat")
+                SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                f.setTimeZone(TimeZone.getTimeZone("UTC"));
+                version += ("\nBeta flavor, versioncode: " + info.versionCode
+                        + "\nbuildtime: " + f.format(new Date(BuildConfig.TIMESTAMP)) + " UTC");
             }
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
-- 
cgit v1.2.3