From e20701c9be2611ccfca2af7a992c44a1fae0641c Mon Sep 17 00:00:00 2001 From: cketti Date: Thu, 25 Jun 2015 18:58:08 +0200 Subject: [PATCH] Don't reinvent the wheel when creating MessageReferences Also, we don't care about flags when dealing with MessageReferences for notifications. --- .../java/com/fsck/k9/controller/MessagingController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 79d4cbcdf..a335b107e 100644 --- a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -4761,9 +4761,9 @@ public class MessagingController implements Runnable { * @param message the single message we intent to act on (in a stacked notification or a summary notification about a single message) * @param notificationID the id of the future notification. Will be used in the intents, so afterwards the correct notification gets closed. */ - private void addWearActions(final NotificationCompat.Builder builder, final int totalMsgCount, final Account account, final Message message, final int notificationID) { + private void addWearActions(final NotificationCompat.Builder builder, final int totalMsgCount, final Account account, final LocalMessage message, final int notificationID) { ArrayList subAllRefs = new ArrayList(); - subAllRefs.add(new MessageReference(account.getUuid(), message.getFolder().getName(), message.getUid(), message.getFlags().size()==0?null:message.getFlags().iterator().next())); + subAllRefs.add(message.makeMessageReference()); LinkedList msgList = new LinkedList(); msgList.add(message); addWearActions(builder, totalMsgCount, 1, account, subAllRefs, msgList, notificationID); @@ -4896,7 +4896,7 @@ public class MessagingController implements Runnable { // multiple messages pending, show inbox style NotificationCompat.InboxStyle style = new NotificationCompat.InboxStyle(builder); int nID = account.getAccountNumber(); - for (Message m : data.messages) { + for (LocalMessage m : data.messages) { style.addLine(buildMessageSummary(context, getMessageSender(context, account, m), getMessageSubject(context, m)));