Issue #62: "Actionable" Notification Buttons

phonegap · Aug 14, 2015 · 24ae490 · 24ae490
1 parent 83251a2
commit 24ae490
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 7 deletions.
diff --git a/src/android/com/adobe/phonegap/push/GCMIntentService.java b/src/android/com/adobe/phonegap/push/GCMIntentService.java
@@ -6,6 +6,7 @@
 import java.net.URL;
 import java.util.Random;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -176,7 +177,12 @@ public void createNotification(Context context, Bundle extras) {
          * Notification count
          */
         setNotificationCount(extras, mBuilder);
-
+
+        /*
+         * Notication add actions
+         */
+        createActions(extras, mBuilder, resources, packageName);
+
         int notId = 0;
 
         try {
@@ -192,6 +198,30 @@ public void createNotification(Context context, Bundle extras) {
         mNotificationManager.notify((String) appName, notId, mBuilder.build());
     }
 
+    private void createActions(Bundle extras, NotificationCompat.Builder mBuilder, Resources resources, String packageName) {
+        Log.d(LOG_TAG, "create actions");
+        String actions = extras.getString("actions");
+        if (actions != null) {
+            try {
+                JSONArray actionsArray = new JSONArray(actions);
+                for (int i=0; i < actionsArray.length(); i++) {
+                    Log.d(LOG_TAG, "adding action");
+                    JSONObject action = actionsArray.getJSONObject(i);
+                    Log.d(LOG_TAG, "adding callback = " + action.getString("callback"));
+                    Intent intent = new Intent(this, PushHandlerActivity.class);
+                    intent.putExtra("callback", action.getString("callback"));
+                    intent.putExtra("pushBundle", extras);
+                    PendingIntent pIntent = PendingIntent.getActivity(this, i, intent, 0);
+
+                    mBuilder.addAction(resources.getIdentifier(action.getString("icon"), "drawable", packageName),
+                            action.getString("title"), pIntent);
+                }
+            } catch(JSONException e) {
+                // nope
+            }
+        }
+    }
+
     private void setNotificationCount(Bundle extras, NotificationCompat.Builder mBuilder) {
         String msgcnt = extras.getString("msgcnt");
         if (msgcnt == null) {

diff --git a/src/android/com/adobe/phonegap/push/PushHandlerActivity.java b/src/android/com/adobe/phonegap/push/PushHandlerActivity.java
@@ -23,14 +23,14 @@ public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		Log.v(LOG_TAG, "onCreate");
 
-		boolean isPushPluginActive = PushPlugin.isActive();
-		processPushBundle(isPushPluginActive);
+        boolean isPushPluginActive = PushPlugin.isActive();
+        processPushBundle(isPushPluginActive);
 
-		finish();
+        finish();
 
-		if (!isPushPluginActive) {
-			forceMainActivityReload();
-		}
+        if (!isPushPluginActive) {
+            forceMainActivityReload();
+        }
 	}
 
 	/**
@@ -45,6 +45,7 @@ private void processPushBundle(boolean isPushPluginActive) {
 
             originalExtras.putBoolean("foreground", false);
             originalExtras.putBoolean("coldstart", !isPushPluginActive);
+            originalExtras.putString("callback", getIntent().getExtras().getString("callback"));
 
 			PushPlugin.sendExtras(originalExtras);
 		}

diff --git a/src/android/com/adobe/phonegap/push/PushPlugin.java b/src/android/com/adobe/phonegap/push/PushPlugin.java
@@ -33,6 +33,7 @@ public class PushPlugin extends CordovaPlugin {
     private static String gSenderID;
     private static Bundle gCachedExtras = null;
     private static boolean gForeground = false;
+    private static String gCallback = null;
 
     /**
      * Gets the application context from cordova's main activity.
@@ -194,6 +195,8 @@ else if (key.equals("coldstart")){
                     json.put("sound", value);
                 } else if (key.equals("image")) {
                     json.put("image", value);
+                } else if (key.equals("callback")) {
+                    json.put("callback", value);
                 }
                 else if ( value instanceof String ) {
                     String strValue = (String)value;

diff --git a/www/push.js b/www/push.js
@@ -33,6 +33,18 @@ var PushNotification = function(options) {
     var success = function(result) {
         if (result && typeof result.registrationId !== 'undefined') {
             that.emit('registration', result);
+        } else if (result && typeof result.callback !== 'undefined') {
+            var executeFunctionByName = function(functionName, context /*, args */) {
+                var args = Array.prototype.slice.call(arguments, 2);
+                var namespaces = functionName.split(".");
+                var func = namespaces.pop();
+                for (var i = 0; i < namespaces.length; i++) {
+                    context = context[namespaces[i]];
+                }
+                return context[func].apply(context, args);
+            }
+
+            executeFunctionByName(result.callback, window, result);
         } else if (result && typeof result.message !== 'undefined') {
             that.emit('notification', result);
         }