From d1f0823f3ca17f71d5438b060bf910c652883ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yJan=20Christian=20Gr=C3=BCnhage?= <me@jcg.re>
Date: Sat, 11 Mar 2017 14:16:40 +0100
Subject: [PATCH] Automated "About" preference screen values (version and build
 date)

---
 .../java/de/arcus/framework/crashhandler/CrashHandler.java   | 5 ++++-
 playmusicexporter/build.gradle                               | 1 +
 .../jcg/playmusicexporter/activities/SettingsActivity.java   | 5 +++++
 playmusicexporter/src/main/res/xml/pref_about.xml            | 4 ++--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/framework/src/main/java/de/arcus/framework/crashhandler/CrashHandler.java b/framework/src/main/java/de/arcus/framework/crashhandler/CrashHandler.java
index 6508ca7..00ea15b 100644
--- a/framework/src/main/java/de/arcus/framework/crashhandler/CrashHandler.java
+++ b/framework/src/main/java/de/arcus/framework/crashhandler/CrashHandler.java
@@ -26,6 +26,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 
+import de.arcus.framework.BuildConfig;
 import de.arcus.framework.activities.CrashActivity;
 import de.arcus.framework.logger.Logger;
 
@@ -83,9 +84,11 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler {
 
 
         // Information
-        logBuilder.append("---------- Information -----------\n");
+        logBuilder.append("---------- App Information -----------\n");
         logBuilder.append("PackageName: ").append(mActivity.getPackageName()).append("\n");
         logBuilder.append("Crashed activity: ").append(mActivity.getLocalClassName()).append("\n");
+        logBuilder.append("Version number: ").append(BuildConfig.VERSION_NAME).append("\n");
+        logBuilder.append("Version code: ").append(BuildConfig.VERSION_CODE).append("\n");
         logBuilder.append("\n");
 
 
diff --git a/playmusicexporter/build.gradle b/playmusicexporter/build.gradle
index 16a4463..ab2a776 100644
--- a/playmusicexporter/build.gradle
+++ b/playmusicexporter/build.gradle
@@ -40,6 +40,7 @@ android {
         jackOptions {
             enabled true
         }
+        buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + System.currentTimeMillis() + "L)"
     }
     buildTypes {
         release {
diff --git a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/SettingsActivity.java b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/SettingsActivity.java
index c58c676..26b8b9a 100644
--- a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/SettingsActivity.java
+++ b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/SettingsActivity.java
@@ -23,6 +23,7 @@ import re.jcg.playmusicexporter.services.ExportAllJob;
 import re.jcg.playmusicexporter.services.ExportAllService;
 import re.jcg.playmusicexporter.settings.PlayMusicExporterPreferences;
 
+import java.text.SimpleDateFormat;
 import java.util.List;
 
 /**
@@ -305,6 +306,10 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             super.onCreate(savedInstanceState);
             addPreferencesFromResource(R.xml.pref_about);
             setHasOptionsMenu(true);
+            findPreference("about_version_number").setSummary(BuildConfig.VERSION_NAME);
+            findPreference("about_build_date")
+                    .setSummary(SimpleDateFormat.getDateInstance().format(BuildConfig.BUILD_TIME));
+
         }
 
         @Override
diff --git a/playmusicexporter/src/main/res/xml/pref_about.xml b/playmusicexporter/src/main/res/xml/pref_about.xml
index 8d32df7..8536818 100644
--- a/playmusicexporter/src/main/res/xml/pref_about.xml
+++ b/playmusicexporter/src/main/res/xml/pref_about.xml
@@ -50,11 +50,11 @@
         <!-- TODO change Version number and build date with releases -->
         <!-- Version number-->
         <Preference
-            android:summary="0.9.4"
+            android:key="about_version_number"
             android:title="@string/settings_version_number" />
         <!-- Build date-->
         <Preference
-            android:summary="01.02.2017"
+            android:key="about_build_date"
             android:title="@string/settings_build_date" />
     </PreferenceCategory>