Cherry pick branch 'genexuslabs:fix/android-jsonwrapper' into beta

Author: fpanizza

android/src/main/java/com/genexus/specific/android/AndroidJSONSerialization.java

@@ -9,6 +9,7 @@
 import java.util.Map;
 
 public class AndroidJSONSerialization implements IExtensionJSONSerialization {
+	
 	@Override
 	public Iterator<Map.Entry<String, Object>> getJSONObjectIterator(JSONObjectWrapper obj) {
 		Map<String, Object> map = new LinkedHashMap<>();
@@ -24,4 +25,15 @@ public Iterator<Map.Entry<String, Object>> getJSONObjectIterator(JSONObjectWrapp
 	public JSONTokener getJSONTokener(String s) {
 		return new AndroidJSONTokenerWrapper(s);
 	}
+
+	@Override
+	public Map<String, Object> getJSONObjectMap(JSONObjectWrapper obj) {
+		Map<String, Object> map = new LinkedHashMap<>();
+		for (Iterator<String> it = obj.keys(); it.hasNext(); ) {
+			String k = it.next();
+			map.put(k, obj.get(k)); // add key and value to map result
+		}
+		return map;
+		
+	}
 }

common/src/main/java/com/genexus/common/interfaces/IExtensionJSONSerialization.java

@@ -9,4 +9,5 @@
 public interface IExtensionJSONSerialization {
 	Iterator<Map.Entry<String, Object>> getJSONObjectIterator(JSONObjectWrapper obj);
 	JSONTokener getJSONTokener(String s);
+	public Map<String, Object> getJSONObjectMap(JSONObjectWrapper obj);
 }

common/src/main/java/com/genexus/json/JSONObjectWrapper.java

@@ -22,15 +22,12 @@ public JSONObjectWrapper(String string) {
 			? SpecificImplementation.JsonSerialization.getJSONTokener(string)
 			: new JSONTokenerWrapper(string)
 		);
-
-		if (map == null)
-			map = new LinkedHashMap<String, Object>();
+		initMap();
 	}
 
 	public JSONObjectWrapper(JSONTokenerWrapper token) {
 		super(token);
-		if (map == null)
-			map = new LinkedHashMap<String, Object>();
+		initMap();
 	}
 
 	public JSONObjectWrapper(Map<?,?> m) {
@@ -48,8 +45,18 @@ public JSONObjectWrapper(Map<?,?> m) {
 
 	public JSONObjectWrapper(JSONObject jsonObject) {
 		super(jsonObject.toString());
+		initMap();
+	}
+
+	private void initMap() {
 		if (map == null)
-			map = new LinkedHashMap<String, Object>();
+		{
+			// this is a workaround for the Android implementation not loading the map in the JsonObject constructor
+			if (SpecificImplementation.JsonSerialization != null)
+				map = SpecificImplementation.JsonSerialization.getJSONObjectMap(this);
+			else
+				map = new LinkedHashMap<String, Object>();	
+		}
 	}
 
 	public Set<Entry<String, Object>> entrySet() {