Merge pull request #56 from urbanairship/clear-notifications

Add notification management support

Author: rlepinski

CHANGELOG.md

@@ -1,3 +1,7 @@
+Version 1.3.0 - November 15, 2017
+=================================
+- Added APIs to manage active notifications.
+
 Version 1.2.3 - October 30, 2017
 ================================
 - Changed Android Message Center title to be "Message Center" instead of the app name

android/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         minSdkVersion 16

android/src/main/java/com/urbanairship/reactnative/ReactAirshipReceiver.java

@@ -37,9 +37,18 @@ protected void onChannelUpdated(@NonNull Context context, @NonNull String channe
         UrbanAirshipReactModule.checkOptIn(context);
     }
 
+
     @Override
     protected void onPushReceived(@NonNull Context context, @NonNull PushMessage message, boolean notificationPosted) {
-        Event event = new PushReceivedEvent(message);
+        if (!notificationPosted) {
+            Event event = new PushReceivedEvent(message);
+            EventEmitter.shared().sendEvent(context, event);
+        }
+    }
+
+    @Override
+    protected void onNotificationPosted(@NonNull Context context, @NonNull NotificationInfo notificationInfo) {
+        Event event = new PushReceivedEvent(notificationInfo);
         EventEmitter.shared().sendEvent(context, event);
     }
 

android/src/main/java/com/urbanairship/reactnative/ReactAutopilot.java

@@ -4,6 +4,7 @@
 
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
+import android.support.v4.app.NotificationCompat;
 
 import com.urbanairship.Autopilot;
 import com.urbanairship.UAirship;
@@ -14,9 +15,12 @@
 import com.urbanairship.actions.DeepLinkAction;
 import com.urbanairship.actions.OpenRichPushInboxAction;
 import com.urbanairship.actions.OverlayRichPushMessageAction;
+import com.urbanairship.push.PushManager;
 import com.urbanairship.reactnative.events.DeepLinkEvent;
 import com.urbanairship.reactnative.events.InboxUpdatedEvent;
 import com.urbanairship.richpush.RichPushInbox;
+import com.urbanairship.push.notifications.DefaultNotificationFactory;
+import com.urbanairship.push.PushMessage;
 
 import static com.urbanairship.reactnative.UrbanAirshipReactModule.AUTO_LAUNCH_MESSAGE_CENTER;
 
@@ -78,6 +82,24 @@ public boolean apply(ActionArguments actionArguments) {
                         return true;
                     }
                 });
+
+
+        DefaultNotificationFactory notificationFactory = new DefaultNotificationFactory(UAirship.getApplicationContext()) {
+            @Override
+            public NotificationCompat.Builder extendBuilder(@NonNull NotificationCompat.Builder builder, @NonNull PushMessage message, int notificationId) {
+                builder.getExtras().putBundle("push_message", message.getPushBundle());
+                return builder;
+            }
+        };
+
+        if (airship.getAirshipConfigOptions().notificationIcon != 0) {
+            notificationFactory.setSmallIconId(airship.getAirshipConfigOptions().notificationIcon);
+        }
+
+        notificationFactory.setColor(airship.getAirshipConfigOptions().notificationAccentColor);
+        notificationFactory.setNotificationChannel(airship.getAirshipConfigOptions().notificationChannel);
+
+        airship.getPushManager().setNotificationFactory(notificationFactory);
     }
 
 }

android/src/main/java/com/urbanairship/reactnative/UrbanAirshipReactModule.java

@@ -3,6 +3,7 @@
 package com.urbanairship.reactnative;
 
 import android.Manifest;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -11,9 +12,12 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.service.notification.StatusBarNotification;
 import android.support.annotation.NonNull;
+import android.support.v4.app.NotificationManagerCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.os.AsyncTaskCompat;
+import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Dynamic;
@@ -34,10 +38,13 @@
 import com.urbanairship.actions.ActionRunRequest;
 import com.urbanairship.actions.LandingPageActivity;
 import com.urbanairship.analytics.AssociatedIdentifiers;
+import com.urbanairship.push.PushMessage;
 import com.urbanairship.push.TagGroupsEditor;
 import com.urbanairship.reactnative.events.NotificationOptInEvent;
+import com.urbanairship.reactnative.events.PushReceivedEvent;
 import com.urbanairship.richpush.RichPushInbox;
 import com.urbanairship.richpush.RichPushMessage;
+import com.urbanairship.util.UAStringUtil;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -598,12 +605,84 @@ public void markInboxMessageRead(String messageId, Promise promise) {
         }
     }
 
+    @ReactMethod
+    public void clearNotifications() {
+        NotificationManagerCompat.from(UAirship.getApplicationContext()).cancelAll();
+    }
+
+    @ReactMethod
+    public void clearNotification(String identifier) {
+        if (UAStringUtil.isEmpty(identifier)) {
+            return;
+        }
+
+        String[] parts = identifier.split(":", 2);
+        if (parts.length == 0) {
+            Log.e(getName(), "Invalid identifier: " + identifier);
+            return;
+        }
+
+        int id;
+        String tag = null;
+        try {
+            id = Integer.valueOf(parts[0]);
+        } catch (NumberFormatException e) {
+            Log.e(getName(), "Invalid identifier: " + identifier);
+            return;
+        }
+
+        if (parts.length == 2) {
+            tag = parts[1];
+        }
+
+
+        NotificationManagerCompat.from(UAirship.getApplicationContext()).cancel(tag, id);
+    }
+
+
+
     /**
-     * Forces the inbox to refresh. This is normally not needed as the inbox will automatically refresh on foreground or when a push arrives thats associated with a message.
+     * Retrieves the current inbox messages.
      *
      * @param promise The JS promise.
      */
     @ReactMethod
+    public void getActiveNotifications(Promise promise) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            WritableArray notifications = Arguments.createArray();
+
+            NotificationManager notificationManager = (NotificationManager) UAirship.getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);
+            StatusBarNotification[] statusBarNotifications = notificationManager.getActiveNotifications();
+
+            for (StatusBarNotification statusBarNotification : statusBarNotifications) {
+                int id = statusBarNotification.getId();
+                String tag = statusBarNotification.getTag();
+
+                PushMessage pushMessage;
+                Bundle extras = statusBarNotification.getNotification().extras;
+                if (extras != null && extras.containsKey("push_message")) {
+                    pushMessage = new PushMessage(extras.getBundle("push_message"));
+                } else {
+                    pushMessage = new PushMessage(new Bundle());
+                }
+
+                notifications.pushMap(new PushReceivedEvent(pushMessage, id, tag).getBody());
+            }
+
+            promise.resolve(notifications);
+        } else {
+            promise.reject("UNSUPPORTED", "Getting active notifications is only supported on Marshmallow and newer devices.");
+        }
+    }
+
+
+
+        /**
+         * Forces the inbox to refresh. This is normally not needed as the inbox will automatically refresh on foreground or when a push arrives thats associated with a message.
+         *
+         * @param promise The JS promise.
+         */
+    @ReactMethod
     public  void refreshInbox(final Promise promise)  {
         UAirship.shared().getInbox().fetchMessages(new RichPushInbox.FetchMessagesCallback() {
             @Override

android/src/main/java/com/urbanairship/reactnative/events/NotificationResponseEvent.java

@@ -22,7 +22,6 @@ public class NotificationResponseEvent implements Event {
     private static final String RESPONSE_FOREGROUND = "isForeground";
     private static final String RESPONSE_NOTIFICATION = "notification";
 
-
     private final AirshipReceiver.NotificationInfo notificationInfo;
     private final AirshipReceiver.ActionButtonInfo actionButtonInfo;
 
@@ -56,8 +55,7 @@ public String getName() {
     @Override
     public WritableMap getBody() {
         WritableMap map = Arguments.createMap();
-        map.putMap(RESPONSE_NOTIFICATION, new PushReceivedEvent(notificationInfo.getMessage()).getBody());
-
+        map.putMap(RESPONSE_NOTIFICATION, new PushReceivedEvent(notificationInfo).getBody());
 
         if (actionButtonInfo != null) {
             map.putString(RESPONSE_ACTION_ID, actionButtonInfo.getButtonId());
@@ -66,6 +64,7 @@ public WritableMap getBody() {
             map.putBoolean(RESPONSE_FOREGROUND, true);
         }
 
+
         return map;
     }
 

android/src/main/java/com/urbanairship/reactnative/events/PushReceivedEvent.java

@@ -2,13 +2,17 @@
 
 package com.urbanairship.reactnative.events;
 
+import android.app.Notification;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.urbanairship.push.PushMessage;
+import com.urbanairship.AirshipReceiver;
 import com.urbanairship.reactnative.Event;
+import com.urbanairship.util.UAStringUtil;
+
 
 
 /**
@@ -20,8 +24,11 @@ public class PushReceivedEvent implements Event {
     private static final String PUSH_ALERT = "alert";
     private static final String PUSH_TITLE = "title";
     private static final String PUSH_EXTRAS = "extras";
+    private static final String NOTIFICATION_ID = "notificationId";
 
     private final PushMessage message;
+    private Integer notificationId;
+    private String notificationTag;
 
     /**
      * Default constructor.
@@ -32,6 +39,30 @@ public PushReceivedEvent(@NonNull PushMessage message) {
         this.message = message;
     }
 
+    /**
+     * Default constructor.
+     *
+     * @param notificationInfo The posted notification info.
+     */
+    public PushReceivedEvent(@NonNull AirshipReceiver.NotificationInfo notificationInfo) {
+        this.message = notificationInfo.getMessage();
+        this.notificationId = notificationInfo.getNotificationId();
+        this.notificationTag = notificationInfo.getNotificationTag();
+    }
+
+    /**
+     * Default constructor.
+     *
+     * @param message The push message.
+     */
+    public PushReceivedEvent(@NonNull PushMessage message, int notificationId, String notificationTag) {
+        this.message = message;
+        this.notificationId = notificationId;
+        this.notificationTag = notificationTag;
+    }
+
+
+
     @NonNull
     @Override
     public String getName() {
@@ -51,6 +82,10 @@ public WritableMap getBody() {
             map.putString(PUSH_TITLE, message.getTitle());
         }
 
+        if (notificationId != null) {
+            map.putString(NOTIFICATION_ID, getNotificationdId(notificationId, notificationTag));
+        }
+
         Bundle bundle = new Bundle(message.getPushBundle());
         bundle.remove("android.support.content.wakelockid");
         map.putMap(PUSH_EXTRAS, Arguments.fromBundle(bundle));
@@ -62,4 +97,14 @@ public WritableMap getBody() {
     public boolean isCritical() {
         return false;
     }
+
+
+    static String getNotificationdId(int notificationId, String notificationTag) {
+        String id = String.valueOf(notificationId);
+        if (!UAStringUtil.isEmpty(notificationTag)) {
+            id += ":" + notificationTag;
+        }
+
+        return id;
+    }
 }

ios/UARCTModule/UARCTEventEmitter.h

@@ -48,4 +48,12 @@ extern NSString *const UARCTNotificationPresentationSoundKey;
  */
 - (void)inboxUpdated;
 
+/**
+ * Creates a push map for a given notification content.
+ * @param content The notification content.
+ * @return Push map.
+ */
++ (NSMutableDictionary *)eventBodyForNotificationContent:(UANotificationContent *)content;
+
+
 @end

ios/UARCTModule/UARCTEventEmitter.m

@@ -89,14 +89,14 @@ -(void)deepLinkReceived:(NSString *)deepLink {
 -(void)receivedForegroundNotification:(UANotificationContent *)notificationContent
                     completionHandler:(void (^)(void))completionHandler {
 
-    [self sendEventWithName:UARCTPushReceivedEventName body:[self eventBodyForNotificationContent:notificationContent]];
+    [self sendEventWithName:UARCTPushReceivedEventName body:[UARCTEventEmitter eventBodyForNotificationContent:notificationContent]];
     completionHandler();
 }
 
 -(void)receivedBackgroundNotification:(UANotificationContent *)notificationContent
                     completionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
 
-    [self sendEventWithName:UARCTPushReceivedEventName body:[self eventBodyForNotificationContent:notificationContent]];
+    [self sendEventWithName:UARCTPushReceivedEventName body:[UARCTEventEmitter eventBodyForNotificationContent:notificationContent]];
     completionHandler(UIBackgroundFetchResultNoData);
 }
 
@@ -176,7 +176,7 @@ - (void)inboxUpdated {
 
 - (NSMutableDictionary *)eventBodyForNotificationResponse:(UANotificationResponse *)notificationResponse {
     NSMutableDictionary *body = [NSMutableDictionary dictionary];
-    [body setValue:[self eventBodyForNotificationContent:notificationResponse.notificationContent] forKey:@"notification"];
+    [body setValue:[UARCTEventEmitter eventBodyForNotificationContent:notificationResponse.notificationContent] forKey:@"notification"];
 
     if ([notificationResponse.actionIdentifier isEqualToString:UANotificationDefaultActionIdentifier]) {
         [body setValue:@(YES) forKey:@"isForeground"];
@@ -192,7 +192,7 @@ - (NSMutableDictionary *)eventBodyForNotificationResponse:(UANotificationRespons
     return body;
 }
 
-- (NSMutableDictionary *)eventBodyForNotificationContent:(UANotificationContent *)content {
++ (NSMutableDictionary *)eventBodyForNotificationContent:(UANotificationContent *)content {
     NSMutableDictionary *pushBody = [NSMutableDictionary dictionary];
     [pushBody setValue:content.alertBody forKey:@"alert"];
     [pushBody setValue:content.alertTitle forKey:@"title"];
@@ -212,6 +212,11 @@ - (NSMutableDictionary *)eventBodyForNotificationContent:(UANotificationContent
         [pushBody setValue:extras forKey:@"extras"];
     }
 
+    if (@available(iOS 10.0, *)) {
+        NSString *identifier = content.notification.request.identifier;
+        [pushBody setValue:identifier forKey:@"notificationId"];
+    }
+
     return pushBody;
 }