Merge remote-tracking branch 'origin/upstream-master' into masterHEADstudio-3.4.0studio-3.2.1studio-3.1.2studio-3.0studio-2.3gradle_3.4.0gradle_3.1.2gradle_3.0.0gradle_2.3.0studio-master-devmirror-goog-studio-master-devmastermain

Change-Id: I63f5e16d09297c48432192761b840310935eb903

1 files changed, 28 insertions, 0 deletions

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationDismissBroadcastReceiver.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationDismissBroadcastReceiver.java
new file mode 100644
index 000000000..a4b33b540
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationDismissBroadcastReceiver.java
@@ -0,0 +1,28 @@
+package org.wordpress.android.ui.notifications;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.support.v4.app.NotificationManagerCompat;
+
+import org.wordpress.android.GCMMessageService;
+
+/*
+ * Clears the notification map when a user dismisses a notification
+ */
+public class NotificationDismissBroadcastReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        int notificationId = intent.getIntExtra("notificationId", 0);
+        if (notificationId == GCMMessageService.GROUP_NOTIFICATION_ID) {
+            GCMMessageService.clearNotifications();
+        } else {
+            GCMMessageService.removeNotification(notificationId);
+            // Dismiss the grouped notification if a user dismisses all notifications from a wear device
+            if (!GCMMessageService.hasNotifications()) {
+                NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
+                notificationManager.cancel(GCMMessageService.GROUP_NOTIFICATION_ID);
+            }
+        }
+    }
+}