From 29339bc00a52391d78d7f9b723880ce5577d8981 Mon Sep 17 00:00:00 2001 From: ylecollen Date: Mon, 9 Jan 2017 16:39:54 +0100 Subject: Update getSdkOlmVersion to provide the git commit --- .../olm-sdk/src/main/java/org/matrix/olm/OlmManager.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'java/android/OlmLibSdk/olm-sdk/src/main') 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