gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support delete-multiple push notification

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2021-04-20 07:48:49 +02:00 committed by Andy Scherzinger
parent cdaecef095
commit 90bf76e013
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt
View File

@ -169,6 +169,10 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() {
) )
} else if (deleteAll) { } else if (deleteAll) {
cancelAllNotificationsForAccount(applicationContext, signatureVerification!!.userEntity) cancelAllNotificationsForAccount(applicationContext, signatureVerification!!.userEntity)
} else if (deleteMultiple) {
notificationIds.forEach {
cancelExistingNotificationWithId(applicationContext, signatureVerification!!.userEntity, it)
}
} else if (type == "call") { } else if (type == "call") {
val fullScreenIntent = Intent(applicationContext, MagicCallActivity::class.java) val fullScreenIntent = Intent(applicationContext, MagicCallActivity::class.java)
val bundle = Bundle() val bundle = Bundle()

4
app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
View File

@ -586,6 +586,10 @@ public class NotificationWorker extends Worker {
NotificationUtils.INSTANCE.cancelExistingNotificationWithId(context, signatureVerification.getUserEntity(), decryptedPushMessage.getNotificationId()); NotificationUtils.INSTANCE.cancelExistingNotificationWithId(context, signatureVerification.getUserEntity(), decryptedPushMessage.getNotificationId());
} else if (decryptedPushMessage.isDeleteAll()) { } else if (decryptedPushMessage.isDeleteAll()) {
NotificationUtils.INSTANCE.cancelAllNotificationsForAccount(context, signatureVerification.getUserEntity()); NotificationUtils.INSTANCE.cancelAllNotificationsForAccount(context, signatureVerification.getUserEntity());
} else if (decryptedPushMessage.isDeleteMultiple()) {
for (long notificationId : decryptedPushMessage.getNotificationIds()) {
NotificationUtils.INSTANCE.cancelExistingNotificationWithId(context, signatureVerification.getUserEntity(), notificationId);
}
} else { } else {
credentials = ApiUtils.getCredentials(signatureVerification.getUserEntity().getUsername(), credentials = ApiUtils.getCredentials(signatureVerification.getUserEntity().getUsername(),
signatureVerification.getUserEntity().getToken()); signatureVerification.getUserEntity().getToken());

6
app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java
View File

@ -44,12 +44,18 @@ public class DecryptedPushMessage {
@JsonField(name = "nid") @JsonField(name = "nid")
public long notificationId; public long notificationId;
@JsonField(name = "nids")
public long[] notificationIds;
@JsonField(name = "delete") @JsonField(name = "delete")
public boolean delete; public boolean delete;
@JsonField(name = "delete-all") @JsonField(name = "delete-all")
public boolean deleteAll; public boolean deleteAll;
@JsonField(name = "delete-multiple")
public boolean deleteMultiple;
@JsonIgnore @JsonIgnore
public NotificationUser notificationUser; public NotificationUser notificationUser;