diff options
author | pedroGitt <pedro.contreiras@amdocs.com> | 2016-10-13 09:36:43 +0200 |
---|---|---|
committer | pedroGitt <pedro.contreiras@amdocs.com> | 2016-10-13 09:36:43 +0200 |
commit | 502de788f4ba77604de7354e9945ea9e199ebc75 (patch) | |
tree | deb02fd5d2e5abc9cd49b232e7443b5bbd62a1f6 /java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h | |
parent | 6ea9fb450ec1ef10b32d65ceb00a6042b927a95c (diff) | |
parent | f88ee7677ccee62ae2ddb1d0125ec673b0b39bd7 (diff) |
Merge remote-tracking branch 'origin/pedroc/android_e2e' into pedroc/android_e2e_dev
Diffstat (limited to 'java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h')
-rw-r--r-- | java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h | 48 |
1 files changed, 48 insertions, 0 deletions
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 new file mode 100644 index 0000000..d811c3f --- /dev/null +++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h @@ -0,0 +1,48 @@ +#ifndef _OMLJNI_H +#define _OMLJNI_H + +#include <cstdlib> +#include <cstdio> +#include <string> +#include <sstream> +#include <map> +#include <jni.h> +#include <android/log.h> + +#include "olm/olm.h" + +#define TAG "OlmJniNative" + +/* logging macros */ +#define ENABLE_LOGS + +#ifdef ENABLE_LOGS + #define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) + #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__) + #define LOGW(...) __android_log_print(ANDROID_LOG_WARN, TAG, __VA_ARGS__) + #define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__) +#else + #define LOGV(...) + #define LOGD(...) + #define LOGW(...) + #define LOGE(...) +#endif + +#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; + + +typedef struct _AccountContext +{ + OlmAccount* mAccountPtr; + _AccountContext(): mAccountPtr(NULL){} +} AccountContext; + +#endif |