From 034fa6be40b1a354dad5394cdb43651f435f8adb Mon Sep 17 00:00:00 2001 From: pedroGitt Date: Tue, 18 Oct 2016 15:59:36 +0200 Subject: - Add new API for OlmUtility - Introducing namespace AndroidOlmSdk - Fix logs (function names mixed up) - Add new check based on the calling java object instance type (IsInstanceOf()) - Fix return value for getXXXInstanceId() in case of failure. Now 0 is returned. --- .../OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h') 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 e1fea02..70267ff 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 @@ -44,21 +44,16 @@ #define FUNC_DEF(class_name,func_name) JNICALL Java_org_matrix_olm_##class_name##_##func_name -// Error codes definition -static const int ERROR_CODE_OK = 0; -static const int ERROR_CODE_NO_MATCHING_ONE_TIME_KEYS = ERROR_CODE_OK+1; -static const int ERROR_CODE_KO = -1; - -// constants -static const int ACCOUNT_CREATION_RANDOM_MODULO = 256; - - -// strings -static const char *CLASS_OLM_OUTBOUND_GROUP_SESSION = "org/matrix/olm/OlmOutboundGroupSession"; -static const char *CLASS_OLM_INBOUND_GROUP_SESSION = "org/matrix/olm/OlmInboundGroupSession"; -static const char *CLASS_OLM_SESSION = "org/matrix/olm/OlmSession"; -static const char *CLASS_OLM_ACCOUNT = "org/matrix/olm/OlmAccount"; -static const char *CLASS_OLM_UTILITY = "org/matrix/olm/OlmUtility"; +namespace AndroidOlmSdk +{ + // Error codes definition + static const int ERROR_CODE_OK = 0; + static const int ERROR_CODE_NO_MATCHING_ONE_TIME_KEYS = ERROR_CODE_OK+1; + static const int ERROR_CODE_KO = -1; + + // constants + static const int ACCOUNT_CREATION_RANDOM_MODULO = 256; +} #ifdef __cplusplus extern "C" { @@ -70,7 +65,7 @@ jlong getSessionInstanceId(JNIEnv* aJniEnv, jobject aJavaObject); jlong getAccountInstanceId(JNIEnv* aJniEnv, jobject aJavaObject); jlong getInboundGroupSessionInstanceId(JNIEnv* aJniEnv, jobject aJavaObject); jlong getOutboundGroupSessionInstanceId(JNIEnv* aJniEnv, jobject aJavaObject); - +jlong getUtilityInstanceId(JNIEnv* aJniEnv, jobject aJavaObject); #ifdef __cplusplus } -- cgit v1.2.3