From b3c20156165962df72e1b6ae31a86e7e73d0794a Mon Sep 17 00:00:00 2001
From: pedroGitt <pedro.contreiras@amdocs.com>
Date: Wed, 23 Nov 2016 09:36:46 +0100
Subject: Rename JNI API: getOlmLibVersion() => getOlmLibVersionJni()

---
 .../OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java   | 5 ++++-
 java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp          | 4 ++--
 java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h            | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'java/android/OlmLibSdk')

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 5170ee9..765de5e 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
@@ -56,6 +56,9 @@ public class OlmManager {
      * Get the OLM lib version.
      * @return the lib version as a string
      */
-    public native String getOlmLibVersion();
+    public String getOlmLibVersion(){
+        return getOlmLibVersionJni();
+    }
+    public native String getOlmLibVersionJni();
 }
 
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp
index 07446b0..9e6ed2a 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp
@@ -465,14 +465,14 @@ JNIEXPORT jstring OLM_ACCOUNT_FUNC_DEF(signMessageJni)(JNIEnv *env, jobject thiz
 }
 
 
-JNIEXPORT jstring OLM_MANAGER_FUNC_DEF(getOlmLibVersion)(JNIEnv* env, jobject thiz)
+JNIEXPORT jstring OLM_MANAGER_FUNC_DEF(getOlmLibVersionJni)(JNIEnv* env, jobject thiz)
 {
   uint8_t majorVer=0, minorVer=0, patchVer=0;
   jstring returnValueStr=0;
   char buff[150];
 
   olm_get_library_version(&majorVer, &minorVer, &patchVer);
-  LOGD("## getOlmLibVersion(): Major=%d Minor=%d Patch=%d", majorVer, minorVer, patchVer);
+  LOGD("## getOlmLibVersionJni(): Major=%d Minor=%d Patch=%d", majorVer, minorVer, patchVer);
 
   snprintf(buff, sizeof(buff), " V%d.%d.%d", majorVer, minorVer, patchVer);
   returnValueStr = env->NewStringUTF((const char*)buff);
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h
index 2aa5f93..b4bf0ef 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-JNIEXPORT jstring OLM_MANAGER_FUNC_DEF(getOlmLibVersion)(JNIEnv *env, jobject thiz);
+JNIEXPORT jstring OLM_MANAGER_FUNC_DEF(getOlmLibVersionJni)(JNIEnv *env, jobject thiz);
 
 // account creation/destruction
 JNIEXPORT void OLM_ACCOUNT_FUNC_DEF(releaseAccountJni)(JNIEnv *env, jobject thiz);
-- 
cgit v1.2.3