aboutsummaryrefslogtreecommitdiff
path: root/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
diff options
context:
space:
mode:
authorpedroGitt <pedro.contreiras@amdocs.com>2016-10-11 15:53:49 +0200
committerpedroGitt <pedro.contreiras@amdocs.com>2016-10-11 15:53:49 +0200
commitf2ca1ce304deee9e8e858ea4a71ea22ba38a342b (patch)
tree176d3c01f010adeb632e35b4f7fbcb8a27b34cfd /java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
parent67f79394708e5424e3eb65ee468edc8b2b5ec5e7 (diff)
- Add OlmSession unit test
- Simplify JNI function signatures definition (Account & Session)
Diffstat (limited to 'java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h')
-rw-r--r--java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
index b04e71e..9b3c30f 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
@@ -3,6 +3,8 @@
#include "olm_jni.h"
+#define OLM_SESSION_FUNC_DEF(func_name) FUNC_DEF(OlmSession,func_name)
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -24,7 +26,7 @@ JNIEXPORT jint JNICALL Java_org_matrix_olm_OlmSession_matchesInboundSessionFromI
// encrypt/decrypt
JNIEXPORT jint JNICALL Java_org_matrix_olm_OlmSession_encryptMessageJni(JNIEnv *env, jobject thiz, jstring aClearMsg, jobject aEncryptedMsg);
-JNIEXPORT jstring JNICALL Java_org_matrix_olm_OlmSession_decryptMessageJni(JNIEnv *env, jobject thiz, jobject aEncryptedMsg);
+JNIEXPORT jstring JNICALL Java_org_matrix_olm_OlmSession_decryptMessage(JNIEnv *env, jobject thiz, jobject aEncryptedMsg);
JNIEXPORT jstring JNICALL Java_org_matrix_olm_OlmSession_getSessionIdentifierJni(JNIEnv *env, jobject thiz);