From eb953d648a74bbf311ea6fca01d932c02c6ed4af Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Sun, 5 Aug 2018 11:34:56 +0200 Subject: [PATCH] Cleanups Signed-off-by: Mario Danic --- .../java/com/nextcloud/talk/jobs/NotificationJob.java | 1 - .../java/com/nextcloud/talk/utils/NotificationUtils.java | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java index 31541e0d5..902961b6d 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java @@ -371,5 +371,4 @@ public class NotificationJob extends Job { } } } - } diff --git a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.java b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.java index 1915ee9e4..005e4e3dc 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.java @@ -28,6 +28,7 @@ import android.content.Context; import android.graphics.Color; import android.os.Build; import android.service.notification.StatusBarNotification; +import android.text.TextUtils; import com.nextcloud.talk.R; import com.nextcloud.talk.models.database.UserEntity; @@ -88,8 +89,11 @@ public class NotificationUtils { StatusBarNotification statusBarNotifications[] = notificationManager.getActiveNotifications(); for (StatusBarNotification statusBarNotification : statusBarNotifications) { - if (statusBarNotification.getGroupKey().equals(crc32GroupString)) { - notificationManager.cancel(statusBarNotification.getId()); + if (statusBarNotification.getNotification() != null && + !TextUtils.isEmpty(statusBarNotification.getNotification().getGroup())) { + if (statusBarNotification.getNotification().getGroup().equals(crc32GroupString)) { + notificationManager.cancel(statusBarNotification.getId()); + } } } }