From 6348a45515943f5ec2347c6a5d7b9dd613ddb163 Mon Sep 17 00:00:00 2001
From: pedroGitt <pedro.contreiras@amdocs.com>
Date: Thu, 27 Oct 2016 18:02:38 +0200
Subject: Introduce a new log file (ENABLE_JNI_LOG) to disable/enable logs in
 JNI side

---
 .../olm-sdk/src/main/jni/olm_inbound_group_session.cpp      |  9 ++++++---
 java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h       | 13 +++++++------
 .../olm-sdk/src/main/jni/olm_outbound_group_session.cpp     |  6 +++++-
 3 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'java')

diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp
index 20d8cb0..05df22b 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp
@@ -36,9 +36,12 @@ JNIEXPORT void OLM_INBOUND_GROUP_SESSION_FUNC_DEF(releaseSessionJni)(JNIEnv *env
   else
   {
     LOGD(" ## releaseSessionJni(): sessionPtr=%p",sessionPtr);
-
+#ifdef ENABLE_JNI_LOG
     size_t retCode = olm_clear_inbound_group_session(sessionPtr);
-    LOGI(" ## releaseSessionJni(): clear_inbound_group_session=%lu",static_cast<long unsigned int>(retCode));
+    LOGD(" ## releaseSessionJni(): clear_inbound_group_session=%lu",static_cast<long unsigned int>(retCode));
+#else
+    olm_clear_inbound_group_session(sessionPtr);
+#endif
 
     LOGD(" ## releaseSessionJni(): free IN");
     free(sessionPtr);
@@ -111,7 +114,7 @@ JNIEXPORT jint OLM_INBOUND_GROUP_SESSION_FUNC_DEF(initInboundGroupSessionWithSes
         sessionResult = olm_init_inbound_group_session(sessionPtr, sessionKeyPtr, sessionKeyLength);
         if(sessionResult == olm_error()) {
             const char *errorMsgPtr = olm_inbound_group_session_last_error(sessionPtr);
-            LOGE(" ## initInboundSessionFromIdKeyJni(): failure - init inbound session creation  Msg=%s",errorMsgPtr);
+            LOGE(" ## initInboundSessionFromIdKeyJni(): failure - init inbound session creation Msg=%s",errorMsgPtr);
         }
         else
         {
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h
index 16eb8b2..29f0310 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h
@@ -28,18 +28,19 @@
 #define TAG "OlmJniNative"
 
 /* logging macros */
-//#define ENABLE_LOGS
+//#define ENABLE_JNI_LOG
 
 #ifdef NDK_DEBUG
-    #warning "NDK_DEBUG is defined"
-#else
-    #warning "NDK_DEBUG not defined"
+    #warning NDK_DEBUG is defined!
+#endif
+
+#ifdef ENABLE_JNI_LOG
+    #warning ENABLE_JNI_LOG is defined!
 #endif
 
 #define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
-#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__)
 
-#ifdef NDK_DEBUG
+#ifdef ENABLE_JNI_LOG
     #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)
     #define LOGW(...) __android_log_print(ANDROID_LOG_WARN, TAG, __VA_ARGS__)
 #else
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.cpp b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.cpp
index f7e6754..59327b4 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.cpp
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.cpp
@@ -37,8 +37,12 @@ JNIEXPORT void OLM_OUTBOUND_GROUP_SESSION_FUNC_DEF(releaseSessionJni)(JNIEnv *en
   {
     LOGD(" ## releaseSessionJni(): sessionPtr=%p",sessionPtr);
 
+#ifdef ENABLE_JNI_LOG
     size_t retCode = olm_clear_outbound_group_session(sessionPtr);
-    LOGI(" ## releaseSessionJni(): clear_outbound_group_session=%lu",static_cast<long unsigned int>(retCode));
+    LOGD(" ## releaseSessionJni(): clear_outbound_group_session=%lu",static_cast<long unsigned int>(retCode));
+#else
+    olm_clear_outbound_group_session(sessionPtr);
+#endif
 
     LOGD(" ## releaseSessionJni(): free IN");
     free(sessionPtr);
-- 
cgit v1.2.3