removeDeliveredNotifications

android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java

@@ -253,24 +253,13 @@ public class FIRLocalMessagingHelper {
     }
 
     public void cancelLocalNotification(String notificationId) {
-        NotificationManager notificationManager =
-                (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-
-        notificationManager.cancel(notificationId.hashCode());
-
         cancelAlarm(notificationId);
-
         SharedPreferences.Editor editor = sharedPreferences.edit();
         editor.remove(notificationId);
         editor.apply();
     }
 
     public void cancelAllLocalNotifications() {
-        NotificationManager notificationManager =
-                (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-
-        notificationManager.cancelAll();
-
         java.util.Map<String, ?> keyMap = sharedPreferences.getAll();
         SharedPreferences.Editor editor = sharedPreferences.edit();
         for(java.util.Map.Entry<String, ?> entry:keyMap.entrySet()){
@@ -280,6 +269,16 @@ public class FIRLocalMessagingHelper {
         editor.apply();
     }
 
+    public void removeDeliveredNotification(String notificationId){
+        NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancel(notificationId.hashCode());
+    }
+
+    public void removeAllDeliveredNotifications(){
+        NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancelAll();
+    }
+
     public void cancelAlarm(String notificationId) {
         Intent notificationIntent = new Intent(mContext, FIRLocalMessagingPublisher.class);
         PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, notificationId.hashCode(), notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);

android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java

@@ -95,6 +95,16 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
       mFIRLocalMessagingHelper.cancelAllLocalNotifications();
     }
 
+    @ReactMethod
+    public void removeDeliveredNotification(String notificationID) {
+        mFIRLocalMessagingHelper.removeDeliveredNotification(notificationID);
+    }
+
+    @ReactMethod
+    public void removeAllDeliveredNotifications(){
+        mFIRLocalMessagingHelper.removeAllDeliveredNotifications();
+    }
+
     @ReactMethod
     public void subscribeToTopic(String topic){
         FirebaseMessaging.getInstance().subscribeToTopic(topic);

index.js

@@ -39,13 +39,27 @@ FCM.getScheduledLocalNotifications = function() {
 };
 
 FCM.cancelLocalNotification = (notificationID) => {
-    RNFIRMessaging.cancelLocalNotification(notificationID);
+    if(!notificationID){
+		return;
+	}
+	RNFIRMessaging.cancelLocalNotification(notificationID);
 };
 
 FCM.cancelAllLocalNotifications = () => {
     RNFIRMessaging.cancelAllLocalNotifications();
 };
 
+FCM.removeDeliveredNotification = (notificationID) => {
+	if(!notificationID){
+		return;
+	}
+	RNFIRMessaging.removeDeliveredNotification(notificationID);
+}
+
+FCM.removeAllDeliveredNotifications = () => {
+	RNFIRMessaging.removeAllDeliveredNotifications();
+}
+
 FCM.setBadgeNumber = (number) => {
     RNFIRMessaging.setBadgeNumber(number);
 }

ios/RNFIRMesssaging.m

@@ -276,13 +276,27 @@ RCT_EXPORT_METHOD(scheduleLocalNotification:(id)data resolver:(RCTPromiseResolve
   }
 }
 
+RCT_EXPORT_METHOD(removeDeliveredNotifications:(NSString*) notificationId)
+{
+  if([UNUserNotificationCenter currentNotificationCenter] != nil){
+    [[UNUserNotificationCenter currentNotificationCenter] removeDeliveredNotificationsWithIdentifiers:@[notificationId]];
+  }
+}
+
+RCT_EXPORT_METHOD(removeAllDeliveredNotifications)
+{
+  if([UNUserNotificationCenter currentNotificationCenter] != nil){
+    [[UNUserNotificationCenter currentNotificationCenter] removeAllDeliveredNotifications];
+  } else {
+    [RCTSharedApplication() setApplicationIconBadgeNumber: 0];
+  }
+}
+
 RCT_EXPORT_METHOD(cancelAllLocalNotifications)
 {
   if([UNUserNotificationCenter currentNotificationCenter] != nil){
     [[UNUserNotificationCenter currentNotificationCenter] removeAllPendingNotificationRequests];
-    [[UNUserNotificationCenter currentNotificationCenter] removeAllDeliveredNotifications];
   } else {
-    [[UIApplication sharedApplication] setApplicationIconBadgeNumber: 0];
     [RCTSharedApplication() cancelAllLocalNotifications];
   }
 }