From: Alexis Laferrière <alexis.laf@xymus.net>
Date: Mon, 24 Aug 2015 17:29:54 +0000 (-0400)
Subject: lib/android: fix `Bundle::string` behavior on null strings from Java
X-Git-Tag: v0.7.8~68^2~1
X-Git-Url: http://nitlanguage.org

lib/android: fix `Bundle::string` behavior on null strings from Java

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
---

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