From da282230563ad56367e8eb285b0a481e2f17221e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Mon, 24 Aug 2015 13:29:54 -0400 Subject: [PATCH] lib/android: fix `Bundle::string` behavior on null strings from Java MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- lib/android/bundle/bundle.nit | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/android/bundle/bundle.nit b/lib/android/bundle/bundle.nit index 82bea46..82acbec 100644 --- a/lib/android/bundle/bundle.nit +++ b/lib/android/bundle/bundle.nit @@ -543,13 +543,15 @@ class Bundle # Returns `null` if none or if it's the wrong value type fun string(key: String): nullable String do - sys.jni_env.push_local_frame(1) - var return_value = native_bundle.get_string(key.to_java_string).to_s - sys.jni_env.pop_local_frame + sys.jni_env.push_local_frame(2) - if return_value == "" then return null + var jstr = native_bundle.get_string(key.to_java_string) + var str = null + if not jstr.is_java_null then str = jstr.to_s - return return_value + sys.jni_env.pop_local_frame + + return str end # Retrieves the `Bool` value corresponding to the given key -- 1.7.9.5