Merge pull request #5931 from k9mail/remove_notifications_on_action (37e406ab) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/controller/MessagingController.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -1167,6 +1167,10 @@ public class MessagingController {
		l.folderStatusChanged(account, folderId);
		}

		if (flag == Flag.SEEN && newState) {
		cancelNotificationsForMessages(account, folderId, uids);
		}

		if (accountSupportsFlags) {
		LocalFolder localFolder = localStore.getFolder(folderId);
		try {
		@@ -1183,6 +1187,13 @@ public class MessagingController {
		}
		}

		private void cancelNotificationsForMessages(Account account, long folderId, List<String> uids) {
		for (String uid : uids) {
		MessageReference messageReference = new MessageReference(account.getUuid(), folderId, uid);
		notificationController.removeNewMailNotification(account, messageReference);
		}
		}

		/**
		* Set or remove a flag for a set of messages in a specific folder.
		* <p>
		@@ -2050,6 +2061,8 @@ public class MessagingController {
		List<LocalMessage> syncedMessages = new ArrayList<>();
		List<String> syncedMessageUids = new ArrayList<>();
		for (LocalMessage message : messages) {
		notificationController.removeNewMailNotification(account, message.makeMessageReference());

		String uid = message.getUid();
		if (uid.startsWith(K9.LOCAL_UID_PREFIX)) {
		localOnlyMessages.add(message);