aboutsummaryrefslogtreecommitdiff
path: root/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp')
-rw-r--r--java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp42
1 files changed, 0 insertions, 42 deletions
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp
index c649d32..9205fc0 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp
@@ -213,45 +213,3 @@ jlong getUtilityInstanceId(JNIEnv* aJniEnv, jobject aJavaObject)
jlong instanceId = getInstanceId(aJniEnv, aJavaObject, CLASS_OLM_UTILITY);
return instanceId;
}
-
-/**
-* Convert a C string into a UTF-8 format string.
-* The conversion is performed in JAVA side to workaround the issue in NewStringUTF().
-* The problem is described here: https://github.com/eclipsesource/J2V8/issues/142
-*/
-jstring javaCStringToUtf8(JNIEnv *env, uint8_t *aCStringMsgPtr, size_t aMsgLength)
-{
- jstring convertedRetValue = 0;
- jbyteArray tempByteArray = NULL;
-
- if (!aCStringMsgPtr || !env)
- {
- LOGE("## javaCStringToUtf8(): failure - invalid parameters (null)");
- }
- else if (!(tempByteArray = env->NewByteArray(aMsgLength)))
- {
- LOGE("## javaCStringToUtf8(): failure - return byte array OOM");
- }
- else
- {
- env->SetByteArrayRegion(tempByteArray, 0, aMsgLength, (const jbyte*)aCStringMsgPtr);
-
- // UTF-8 conversion from JAVA
- jstring strEncode = (env)->NewStringUTF("UTF-8");
- jclass jClass = env->FindClass("java/lang/String");
- jmethodID cstor = env->GetMethodID(jClass, "<init>", "([BLjava/lang/String;)V");
-
- if (jClass && strEncode)
- {
- convertedRetValue = (jstring) env->NewObject(jClass, cstor, tempByteArray, strEncode);
- LOGD(" ## javaCStringToUtf8(): succeed");
- env->DeleteLocalRef(tempByteArray);
- }
- else
- {
- LOGE(" ## javaCStringToUtf8(): failure - invalid Java references");
- }
- }
-
- return convertedRetValue;
-}