From 29339bc00a52391d78d7f9b723880ce5577d8981 Mon Sep 17 00:00:00 2001
From: ylecollen <ylecollen@amdocs.com>
Date: Mon, 9 Jan 2017 16:39:54 +0100
Subject: Update getSdkOlmVersion to provide the git commit

---
 java/android/OlmLibSdk/olm-sdk/build.gradle        | 25 ++++++++++++++++++++++
 .../java/org/matrix/olm/OlmAccountTest.java        |  2 +-
 .../src/main/java/org/matrix/olm/OlmManager.java   | 13 ++++++++---
 3 files changed, 36 insertions(+), 4 deletions(-)

(limited to 'java/android')

diff --git a/java/android/OlmLibSdk/olm-sdk/build.gradle b/java/android/OlmLibSdk/olm-sdk/build.gradle
index 188acb6..9ce4d37 100644
--- a/java/android/OlmLibSdk/olm-sdk/build.gradle
+++ b/java/android/OlmLibSdk/olm-sdk/build.gradle
@@ -15,7 +15,17 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
+        debug {
+            resValue "string", "git_olm_revision", "\"${gitRevision()}\""
+            resValue "string", "git_olm_revision_unix_date", "\"${gitRevisionUnixDate()}\""
+            resValue "string", "git_olm_revision_date", "\"${gitRevisionDate()}\""
+        }
+
         release {
+            resValue "string", "git_olm_revision", "\"${gitRevision()}\""
+            resValue "string", "git_olm_revision_unix_date", "\"${gitRevisionUnixDate()}\""
+            resValue "string", "git_olm_revision_date", "\"${gitRevisionDate()}\""
+
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
@@ -93,6 +103,21 @@ def getNdkBuildCmd() {
     return ndkBuildCmd
 }
 
+def gitRevision() {
+    def cmd = "git rev-parse --short HEAD"
+    return cmd.execute().text.trim()
+}
+
+def gitRevisionUnixDate() {
+    def cmd = "git show -s --format=%ct HEAD^{commit}"
+    return cmd.execute().text.trim()
+}
+
+def gitRevisionDate() {
+    def cmd = "git show -s --format=%ci HEAD^{commit}"
+    return cmd.execute().text.trim()
+}
+
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:21.+'
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
index 699d966..d474f12 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
@@ -65,7 +65,7 @@ public class OlmAccountTest {
 
         String olmLibVersion = mOlmManager.getOlmLibVersion();
         assertNotNull(olmLibVersion);
-        String olmSdkVersion = mOlmManager.getSdkOlmVersion();
+        String olmSdkVersion = mOlmManager.getSdkOlmVersion(getInstrumentation().getContext());
         assertNotNull(olmLibVersion);
         Log.d(LOG_TAG, "## setUpClass(): Versions - Android Olm SDK = "+olmSdkVersion+"  Olm lib ="+olmLibVersion);
     }
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
index 2efb0c2..c1e6031 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
@@ -17,6 +17,7 @@
 
 package org.matrix.olm;
 
+import android.content.Context;
 import android.util.Log;
 
 /**
@@ -25,7 +26,6 @@ import android.util.Log;
  */
 public class OlmManager {
     private static final String LOG_TAG = "OlmManager";
-    private static final String SDK_OLM_VERSION = "V0.1.0_1";
 
     /**
      * Constructor.
@@ -41,8 +41,15 @@ public class OlmManager {
         }
     }
 
-    public String getSdkOlmVersion() {
-        return SDK_OLM_VERSION;
+    /**
+     * Provide the android library version
+     * @param context the context
+     * @return the library version
+     */
+    public String getSdkOlmVersion(Context context) {
+        String gitVersion = context.getResources().getString(R.string.git_olm_revision);
+        String date = context.getResources().getString(R.string.git_olm_revision_date);
+        return gitVersion + "-" + date;
     }
 
     /**
-- 
cgit v1.2.3