Merge pull request #11 from fritzvd/fritzvd/extra-parameters-for-callback

Fritzvd/extra parameters for callback

Author: r0bot

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

@@ -4,6 +4,10 @@
 import android.os.Bundle;
 import android.util.Log;
 import com.google.android.gms.gcm.GcmListenerService;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Set;
 
 /**
  * Push plugin extends the GCM Listener Service and has to be registered in the AndroidManifest
@@ -79,7 +83,18 @@ 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"));
-            onMessageReceivedCallback.success(data.getString("message"));
+            JSONObject dataAsJson = new JSONObject();
+            Set<String> keys = data.keySet();
+            for (String key : keys) {
+                try {
+                    // json.put(key, bundle.get(key)); see edit below
+                    dataAsJson.put(key, JSONObject.wrap(data.get(key)));
+                } catch(JSONException e) {
+//                    Log.d(TAG, "Error thrown: ", e.toStringu());
+                    //Handle exception here
+                }
+            }
+            onMessageReceivedCallback.success(data.getString("message"), dataAsJson.toString());
         } else {
             Log.d(TAG, "No callback function - caching the data for later retrieval.");
             cachedData = data;

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

@@ -8,9 +8,11 @@ public interface PushPluginListener {
      * Defines a success callback method, which is used to pass success function reference
      * from the nativescript to the Java plugin
      *
+     * @param message
      * @param data
      */
-    void success(Object data);
+    void success(Object message, Object data);
+    void success(Object message); // method overload to mimic optional argument
 
 
     /**