From 9209fd91431f74b4ee4a018f60acef33e0c32a44 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 13 Jan 2022 18:29:37 +0100 Subject: [PATCH] app: [Android don't map the empty string to Java null Map it to the empty string in Java, which is less surprising. Signed-off-by: Elias Naur --- app/os_android.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/os_android.go b/app/os_android.go index 51d8289a..9830f39d 100644 --- a/app/os_android.go +++ b/app/os_android.go @@ -1024,11 +1024,12 @@ func javaBool(b bool) C.jboolean { } func javaString(env *C.JNIEnv, str string) C.jstring { - if str == "" { - return 0 - } utf16Chars := utf16.Encode([]rune(str)) - return C.jni_NewString(env, (*C.jchar)(unsafe.Pointer(&utf16Chars[0])), C.int(len(utf16Chars))) + var ptr *C.jchar + if len(utf16Chars) > 0 { + ptr = (*C.jchar)(unsafe.Pointer(&utf16Chars[0])) + } + return C.jni_NewString(env, ptr, C.int(len(utf16Chars))) } func varArgs(args []jvalue) *C.jvalue {