status-im
/
react-native-firebase
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Android] Add the ability to remove notifications based on the tag

This commit is contained in:
David Gruseck 2018-05-07 17:35:10 +02:00
parent 19b226b048
commit 89806d97f7
8 changed files with 68 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/src/main/java/io/invertase/firebase/notifications/DisplayNotificationTask.java
View File

@ -272,13 +272,18 @@ public class DisplayNotificationTask extends AsyncTask<Void, Void, Void> {
}
}
String tag = null;
if (android.containsKey("tag")) {
tag = android.getString("tag");
}
// Create the notification intent
PendingIntent contentIntent = createIntent(intentClass, notification, android.getString("clickAction"));
nb = nb.setContentIntent(contentIntent);
// Build the notification and send it
Notification builtNotification = nb.build();
notificationManager.notify(notificationId.hashCode(), builtNotification);
notificationManager.notify(tag, notificationId.hashCode(), builtNotification);
if (reactContext != null) {
Utils.sendEvent(reactContext, "notifications_notification_displayed", Arguments.fromBundle(notification));

12
android/src/main/java/io/invertase/firebase/notifications/RNFirebaseNotificationManager.java
View File

@ -17,6 +17,7 @@ import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.service.notification.StatusBarNotification;
import android.support.annotation.Nullable;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.RemoteInput;
@ -139,7 +140,7 @@ public class RNFirebaseNotificationManager {
if (!notification.getBundle("schedule").containsKey("repeated")
|| !notification.getBundle("schedule").getBoolean("repeated")) {
String notificationId = notification.getString("notificationId");
preferences.edit().remove(notificationId).apply();;
preferences.edit().remove(notificationId).apply();
}
if (Utils.isAppInForeground(context)) {
@ -181,6 +182,15 @@ public class RNFirebaseNotificationManager {
promise.resolve(null);
}
public void removeDeliveredNotificationsByTag(String tag, Promise promise) {
StatusBarNotification[] statusBarNotifications = notificationManager.getActiveNotifications();
for (StatusBarNotification statusBarNotification : statusBarNotifications) {
if (statusBarNotification.getTag() == tag) {
notificationManager.cancel(statusBarNotification.getTag(), statusBarNotification.getId());
}
}
promise.resolve(null);
}
public void rescheduleNotifications() {
ArrayList<Bundle> bundles = getScheduledNotifications();

6
android/src/main/java/io/invertase/firebase/notifications/RNFirebaseNotifications.java
View File

@ -112,6 +112,11 @@ public class RNFirebaseNotifications extends ReactContextBaseJavaModule implemen
notificationManager.removeDeliveredNotification(notificationId, promise);
}
@ReactMethod
public void removeDeliveredNotificationsByTag(String tag, Promise promise) {
notificationManager.removeDeliveredNotificationsByTag(tag, promise);
}
@ReactMethod
public void setBadge(int badge, Promise promise) {
// Store the badge count for later retrieval
@ -284,6 +289,7 @@ public class RNFirebaseNotifications extends ReactContextBaseJavaModule implemen
}
if (notification.getTag() != null) {
androidMap.putString("group", notification.getTag());
androidMap.putString("tag", notification.getTag());
}
notificationMap.putMap("android", androidMap);

13
ios/RNFirebase/notifications/RNFirebaseNotifications.m
View File

@ -343,6 +343,13 @@ RCT_EXPORT_METHOD(removeDeliveredNotification:(NSString*) notificationId
resolve(nil);
}
RCT_EXPORT_METHOD(removeDeliveredNotificationsByTag:(NSString*) tag
resolver:(RCTPromiseResolveBlock)resolve
rejecter:(RCTPromiseRejectBlock)reject) {
// No implementation for ios
resolve(nil);
}
RCT_EXPORT_METHOD(scheduleNotification:(NSDictionary*) notification
resolver:(RCTPromiseResolveBlock)resolve
rejecter:(RCTPromiseRejectBlock)reject) {
@ -372,7 +379,7 @@ RCT_EXPORT_METHOD(setBadge:(NSInteger) number
resolve(nil);
});
}
RCT_EXPORT_METHOD(jsInitialised:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
jsReady = TRUE;
resolve(nil);
@ -487,11 +494,11 @@ RCT_EXPORT_METHOD(jsInitialised:(RCTPromiseResolveBlock)resolve rejecter:(RCTPro
NSString *identifier = a[@"identifier"];
NSURL *url = [NSURL fileURLWithPath:a[@"url"]];
NSMutableDictionary *attachmentOptions = nil;
if (a[@"options"]) {
NSDictionary *options = a[@"options"];
attachmentOptions = [[NSMutableDictionary alloc] init];
for (id key in options) {
if ([key isEqualToString:@"typeHint"]) {
attachmentOptions[UNNotificationAttachmentOptionsTypeHintKey] = options[key];

2
lib/index.d.ts vendored
View File

@ -1181,6 +1181,7 @@ declare module 'react-native-firebase' {
showWhen?: boolean;
smallIcon?: any;
sortKey?: string;
tag?: string;
ticker?: string;
timeoutAfter?: number;
usesChronometer?: boolean;
@ -1233,6 +1234,7 @@ declare module 'react-native-firebase' {
setShowWhen(showWhen: boolean): Notification;
setSmallIcon(icon: string, level?: number): Notification;
setSortKey(sortKey: string): Notification;
setTag(tag: string): Notification;
setTicker(ticker: string): Notification;
setTimeoutAfter(timeoutAfter: number): Notification;
setUsesChronometer(usesChronometer: boolean): Notification;

17
lib/modules/notifications/AndroidNotification.js
View File

@ -53,6 +53,7 @@ export default class AndroidNotification {
_smallIcon: SmallIcon;
_sortKey: string | void;
// TODO: style: Style; // Need to figure out if this can work
_tag: string | void;
_ticker: string | void;
_timeoutAfter: number | void;
_usesChronometer: boolean | void;
@ -106,6 +107,7 @@ export default class AndroidNotification {
this._showWhen = data.showWhen;
this._smallIcon = data.smallIcon;
this._sortKey = data.sortKey;
this._tag = data.tag;
this._ticker = data.ticker;
this._timeoutAfter = data.timeoutAfter;
this._usesChronometer = data.usesChronometer;
@ -238,6 +240,10 @@ export default class AndroidNotification {
return this._sortKey;
}
get tag(): ?string {
return this._tag;
}
get ticker(): ?string {
return this._ticker;
}
@ -615,6 +621,16 @@ export default class AndroidNotification {
return this._notification;
}
/**
*
* @param tag
* @returns {Notification}
*/
setTag(tag: string): Notification {
this._tag = tag;
return this._notification;
}
/**
*
* @param ticker
@ -709,6 +725,7 @@ export default class AndroidNotification {
smallIcon: this._smallIcon,
sortKey: this._sortKey,
// TODO: style: Style,
tag: this._tag,
ticker: this._ticker,
timeoutAfter: this._timeoutAfter,
usesChronometer: this._usesChronometer,

15
lib/modules/notifications/index.js
View File

@ -291,6 +291,21 @@ export default class Notifications extends ModuleBase {
return getNativeModule(this).removeDeliveredNotification(notificationId);
}
/**
* Remove a delivered notifications by tag.
* @param tag
*/
removeDeliveredNotificationsByTag(tag: string): Promise<void> {
if (!tag) {
return Promise.reject(
new Error(
'Notifications: removeDeliveredNotificationsByTag expects a `tag`'
)
);
}
return getNativeModule(this).removeDeliveredNotificationsByTag(tag);
}
/**
* Schedule a notification
* @param notification

1
lib/modules/notifications/types.js
View File

@ -170,6 +170,7 @@ export type NativeAndroidNotification = {|
smallIcon: SmallIcon,
sortKey?: string,
// TODO: style: Style,
tag?: string,
ticker?: string,
timeoutAfter?: number,
usesChronometer?: boolean,