Return string instead of byte array for b64 encoded data

2 files changed, 12 insertions, 9 deletions

diff --git a/android/olm-sdk/src/main/java/org/matrix/olm/OlmSAS.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmSAS.java
index 70cfb8c..4bd1579 100644
--- a/android/olm-sdk/src/main/java/org/matrix/olm/OlmSAS.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmSAS.java
@@ -86,8 +86,7 @@ public class OlmSAS {
             throw new OlmException(OlmException.EXCEPTION_CODE_SAS_MISSING_THEIR_PKEY, "call setTheirPublicKey first");
         }
         try {
-            byte[] shortBuffer = generateShortCodeJni(info.getBytes("UTF-8"), byteNumber);
-            return shortBuffer;
+            return generateShortCodeJni(info.getBytes("UTF-8"), byteNumber);
         } catch (Exception e) {
             Log.e(LOG_TAG, "## sessionIdentifier(): " + e.getMessage());
             throw new OlmException(OlmException.EXCEPTION_CODE_SAS_GENERATE_SHORT_CODE, e.getMessage());
@@ -95,20 +94,24 @@ public class OlmSAS {
     }
 
 
-    public byte[] calculateMac(String message, String info) throws OlmException {
+    public String calculateMac(String message, String info) throws OlmException {
         try {
-            return calculateMacJni(message.getBytes("UTF-8"), info.getBytes("UTF-8"));
+            byte[] bytes = calculateMacJni(message.getBytes("UTF-8"), info.getBytes("UTF-8"));
+            if (bytes != null) return new String(bytes, "UTF-8");
         } catch (UnsupportedEncodingException e) {
             throw new OlmException(OlmException.EXCEPTION_CODE_SAS_ERROR, e.getMessage());
         }
+        return null;
     }
 
-    public byte[] calculateMacLongKdf(String message, String info) throws OlmException {
+    public String calculateMacLongKdf(String message, String info) throws OlmException {
         try {
-            return calculateMacLongKdfJni(message.getBytes("UTF-8"), info.getBytes("UTF-8"));
+            byte[] bytes = calculateMacLongKdfJni(message.getBytes("UTF-8"), info.getBytes("UTF-8"));
+            if (bytes != null) return new String(bytes, "UTF-8");
         } catch (UnsupportedEncodingException e) {
             throw new OlmException(OlmException.EXCEPTION_CODE_SAS_ERROR, e.getMessage());
         }
+        return null;
     }
 
     /**
diff --git a/android/olm-sdk/src/main/jni/olm_sas.cpp b/android/olm-sdk/src/main/jni/olm_sas.cpp
index 40b9183..400934f 100644
--- a/android/olm-sdk/src/main/jni/olm_sas.cpp
+++ b/android/olm-sdk/src/main/jni/olm_sas.cpp
@@ -148,7 +148,7 @@ JNIEXPORT void OLM_SAS_FUNC_DEF(setTheirPubKey)(JNIEnv *env, jobject thiz,jbyteA
     }
     else if (!(pubKeyPtr = env->GetByteArrayElements(pubKeyBuffer, &pubKeyWasCopied)))
     {
-        LOGE(" ## generateShortCodeJni(): failure - info JNI allocation OOM");
+        LOGE(" ## setTheirPubKey(): failure - info JNI allocation OOM");
         errorMessage = "info JNI allocation OOM";
     }
     else 
@@ -230,7 +230,7 @@ JNIEXPORT jbyteArray OLM_SAS_FUNC_DEF(generateShortCodeJni)(JNIEnv *env, jobject
 
 
 JNIEXPORT jbyteArray OLM_SAS_FUNC_DEF(calculateMacJni)(JNIEnv *env, jobject thiz,jbyteArray messageBuffer,jbyteArray infoBuffer) {
-     LOGD("## calculateMacJni(): IN");
+    LOGD("## calculateMacJni(): IN");
     const char* errorMessage = NULL;
     jbyteArray returnValue = 0;
     OlmSAS* sasPtr = getOlmSasInstanceId(env, thiz);
@@ -310,7 +310,7 @@ JNIEXPORT jbyteArray OLM_SAS_FUNC_DEF(calculateMacJni)(JNIEnv *env, jobject thiz
 }
 
 JNIEXPORT jbyteArray OLM_SAS_FUNC_DEF(calculateMacLongKdfJni)(JNIEnv *env, jobject thiz,jbyteArray messageBuffer,jbyteArray infoBuffer) {
-     LOGD("## calculateMacLongKdfJni(): IN");
+    LOGD("## calculateMacLongKdfJni(): IN");
     const char* errorMessage = NULL;
     jbyteArray returnValue = 0;
     OlmSAS* sasPtr = getOlmSasInstanceId(env, thiz);