From ca08a7100755ee482e04fc2a968f459f65151952 Mon Sep 17 00:00:00 2001 From: Marcus Wolschon Date: Wed, 10 Jun 2015 08:33:11 +0200 Subject: [PATCH] #619 "Add android wear support" cleanup --- .../fsck/k9/controller/MessagingController.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java index 8b8bf9f0e..16b7f1af3 100644 --- a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -4669,7 +4669,9 @@ public class MessagingController implements Runnable { // Don't notify if the sender address matches one of our identities and the user chose not // to be notified for such messages. - return !(account.isAnIdentity(message.getFrom()) && !account.isNotifySelfNewMail()); + if (account.isAnIdentity(message.getFrom()) && !account.isNotifySelfNewMail()) { + return false; + } } @@ -5360,17 +5362,6 @@ public class MessagingController implements Runnable { notificationManager.cancel(account.getAccountNumber()); notificationManager.cancel(-1000 - account.getAccountNumber()); - // cancel stacked notifications on Android Wear that share this as a summary notification - //NotificationData data = notificationData.get(account.getAccountNumber()); - //if (data != null) { - // Collection stackedChildNotifications = data.getStackedChildNotifications(); - // if (stackedChildNotifications != null) { - // for (Integer stackedNotificationId : stackedChildNotifications) { - // notificationManager.cancel(stackedNotificationId); - // } - // } - //} - notificationData.remove(account.getAccountNumber()); }