From 03396102691409083143882ee1ed54e137f183d2 Mon Sep 17 00:00:00 2001 From: ylecollen Date: Mon, 9 Jan 2017 10:01:01 +0100 Subject: Simplify the function declarations in olm_jni to avoid having to cast the getXXX methods --- java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 1c80388..73a529d 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 @@ -68,11 +68,12 @@ extern "C" { // internal helper functions bool setRandomInBuffer(JNIEnv *env, uint8_t **aBuffer2Ptr, size_t aRandomSize); -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); + +struct OlmSession* getSessionInstanceId(JNIEnv* aJniEnv, jobject aJavaObject); +struct OlmAccount* getAccountInstanceId(JNIEnv* aJniEnv, jobject aJavaObject); +struct OlmInboundGroupSession* getInboundGroupSessionInstanceId(JNIEnv* aJniEnv, jobject aJavaObject); +struct OlmOutboundGroupSession* getOutboundGroupSessionInstanceId(JNIEnv* aJniEnv, jobject aJavaObject); +struct OlmUtility* getUtilityInstanceId(JNIEnv* aJniEnv, jobject aJavaObject); #ifdef __cplusplus } -- cgit v1.2.3