Merge pull request #15 from NativeScript/pzlatanov/jsonObject-wrap-override

Pzlatanov/json object wrap override

Author: alexanderfilipov

native-src/android/src/com/telerik/pushplugin/JsonObjectExtended.java

@@ -0,0 +1,64 @@
+package com.telerik.pushplugin;
+
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import java.util.Collection;
+import java.util.Map;
+
+
+public class JsonObjectExtended extends JSONObject{
+    //Overwrite for the method wrap as it is only available in Api Level 19+ and this ensures
+    //it will work on lower level deployments
+
+    /**
+     * Wraps the given object if necessary.
+     *
+     * <p>If the object is null or , returns {@link #NULL}.
+     * If the object is a {@code JSONArray} or {@code JSONObject}, no wrapping is necessary.
+     * If the object is {@code NULL}, no wrapping is necessary.
+     * If the object is an array or {@code Collection}, returns an equivalent {@code JSONArray}.
+     * If the object is a {@code Map}, returns an equivalent {@code JSONObject}.
+     * If the object is a primitive wrapper type or {@code String}, returns the object.
+     * Otherwise if the object is from a {@code java} package, returns the result of {@code toString}.
+     * If wrapping fails, returns null.
+     */
+    public static Object wrap(Object o) {
+        if (o == null) {
+            return NULL;
+        }
+        if (o instanceof JSONArray || o instanceof JSONObject) {
+            return o;
+        }
+        if (o.equals(NULL)) {
+            return o;
+        }
+        try {
+            if (o instanceof Collection) {
+                return new JSONArray((Collection) o);
+            } else if (o.getClass().isArray()) {
+                return new JSONArray(o);
+            }
+            if (o instanceof Map) {
+                return new JSONObject((Map) o);
+            }
+            if (o instanceof Boolean ||
+                    o instanceof Byte ||
+                    o instanceof Character ||
+                    o instanceof Double ||
+                    o instanceof Float ||
+                    o instanceof Integer ||
+                    o instanceof Long ||
+                    o instanceof Short ||
+                    o instanceof String) {
+                return o;
+            }
+            if (o.getClass().getPackage().getName().startsWith("java.")) {
+                return o.toString();
+            }
+        } catch (Exception ignored) {
+        }
+        return null;
+    }
+
+}

native-src/android/src/com/telerik/pushplugin/PushPlugin.java

@@ -5,7 +5,6 @@
 import android.util.Log;
 import com.google.android.gms.gcm.GcmListenerService;
 import org.json.JSONException;
-import org.json.JSONObject;
 import java.util.Set;
 
 /**
@@ -82,11 +81,11 @@ public static void setOnMessageReceivedCallback(PushPluginListener callbacks) {
     public static void executeOnMessageReceivedCallback(Bundle data) {
         if (onMessageReceivedCallback != null) {
             Log.d(TAG, "Sending message to client: " + data.getString("message"));
-            JSONObject dataAsJson = new JSONObject();
+            JsonObjectExtended dataAsJson = new JsonObjectExtended();
             Set<String> keys = data.keySet();
             for (String key : keys) {
                 try {
-                    dataAsJson.put(key, JSONObject.wrap(data.get(key)));
+                    dataAsJson.put(key, JsonObjectExtended.wrap(data.get(key)));
                 } catch(JSONException e) {
                     Log.d(TAG, "Error thrown while parsing push notification data bundle to json: " + e.getMessage());
                     //Handle exception here