From d8c6882b8fed1a71e5932d17d74827d1aba9da15 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 18 Oct 2018 07:05:11 +0000 Subject: [PATCH] Always load content on expand --- .../java/eu/faircode/email/FragmentMessages.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 11987aa1..f531afa1 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -884,8 +884,7 @@ public class FragmentMessages extends FragmentEx { if (expand != null) { expanded.add(expand.id); - if (!expand.ui_seen) - handleExpand(expand.id); + handleExpand(expand.id); } } @@ -927,14 +926,12 @@ public class FragmentMessages extends FragmentEx { EntityMessage message = db.message().getMessage(id); EntityFolder folder = db.folder().getFolder(message.folder); - if (!EntityFolder.OUTBOX.equals(folder.type)) { - if (!message.content) - EntityOperation.queue(db, message, EntityOperation.BODY); + if (!message.content) + EntityOperation.queue(db, message, EntityOperation.BODY); - if (!message.ui_seen) { - db.message().setMessageUiSeen(message.id, true); - EntityOperation.queue(db, message, EntityOperation.SEEN, true); - } + if (!message.ui_seen && !EntityFolder.OUTBOX.equals(folder.type)) { + db.message().setMessageUiSeen(message.id, true); + EntityOperation.queue(db, message, EntityOperation.SEEN, true); } db.setTransactionSuccessful();