moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-09 12:48:02 -05:00
Code Issues Releases Wiki Activity

#619 "Add android wear support"

Browse Source 
cleanup
This commit is contained in:
Marcus Wolschon 2015-06-10 08:33:11 +02:00
parent 44b78f09be
commit ca08a71007
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
View File

@ -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 // Don't notify if the sender address matches one of our identities and the user chose not
// to be notified for such messages. // 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(account.getAccountNumber());
notificationManager.cancel(-1000 - 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<Integer> stackedChildNotifications = data.getStackedChildNotifications();
// if (stackedChildNotifications != null) {
// for (Integer stackedNotificationId : stackedChildNotifications) {
// notificationManager.cancel(stackedNotificationId);
// }
// }
//}
notificationData.remove(account.getAccountNumber()); notificationData.remove(account.getAccountNumber());
} }