From 5573d3ab23de21b93b1ecc50d4fce96b02a42886 Mon Sep 17 00:00:00 2001
From: pedroGitt <pedro.contreiras@amdocs.com>
Date: Wed, 5 Oct 2016 18:25:09 +0200
Subject: First commit adding Olm Lib for Android - Add Android Studio project

---
 .../OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h       | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h

(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
new file mode 100644
index 0000000..a504333
--- /dev/null
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h
@@ -0,0 +1,46 @@
+#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
+
+// 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 = 500;
+
+
+typedef struct _AccountContext
+{
+  OlmAccount* mAccountPtr;
+  _AccountContext(): mAccountPtr(NULL){}
+} AccountContext;
+
+#endif
-- 
cgit v1.2.3


From 655c841cc3720d1bb9892d60a2d7ca136c90cfbd Mon Sep 17 00:00:00 2001
From: pedroGitt <pedro.contreiras@amdocs.com>
Date: Thu, 6 Oct 2016 19:55:03 +0200
Subject: - Update Unit tests for OlmAccount  - new file olm_utility.cpp to
 have a stand alone function to initialize/alloc a random buffer  - new class
 OlmMessage  - complete OlmSession API with encryptMessage()  - comments
 review  - OlmAccount unit tests are green  - new gradle to compile the shared
 lib according to debug mode

---
 java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 a504333..1e85cc1 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
@@ -34,7 +34,7 @@ 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 = 500;
+static const int ACCOUNT_CREATION_RANDOM_MODULO = 256;
 
 
 typedef struct _AccountContext
-- 
cgit v1.2.3


From f2ca1ce304deee9e8e858ea4a71ea22ba38a342b Mon Sep 17 00:00:00 2001
From: pedroGitt <pedro.contreiras@amdocs.com>
Date: Tue, 11 Oct 2016 15:53:49 +0200
Subject: - Add OlmSession unit test - Simplify JNI function signatures
 definition (Account & Session)

---
 java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h | 2 ++
 1 file changed, 2 insertions(+)

(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 1e85cc1..d811c3f 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,6 +28,8 @@
     #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;
-- 
cgit v1.2.3