Android : improve the version number management (#46)

Add functions to make the difference between the native and the java code version.

Factor out the version management in the makefiles.

1 files changed, 13 insertions, 4 deletions

diff --git a/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
index c1e6031..cd33a5a 100644
--- a/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
@@ -43,17 +43,26 @@ public class OlmManager {
 
     /**
      * Provide the android library version
-     * @param context the context
      * @return the library version
      */
-    public String getSdkOlmVersion(Context context) {
+    public String getVersion() {
+        return BuildConfig.VERSION_NAME;
+    }
+
+    /**
+     * Provide a detailed version.
+     * It contains the android and the native libraries versions.
+     * @param context the context
+     * @return the detailed version
+     */
+    public String getDetailedVersion(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;
+        return getVersion() + " - olm version (" + getOlmLibVersion() + ") - " + gitVersion + "-" + date;
     }
 
     /**
-     * Get the OLM lib version.
+     * Provide the native OLM lib version.
      * @return the lib version as a string
      */
     public String getOlmLibVersion(){