From f233ea9007a05a595496382365bf83a95dec8abd Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 30 Nov 2018 10:52:59 +0100 Subject: [PATCH] Fixed expanding large messages on metered connection --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index fb483a4a65..775cc8e2c3 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -1396,9 +1396,7 @@ public class FragmentMessages extends FragmentEx { TupleMessageEx single = null; TupleMessageEx see = null; for (TupleMessageEx message : messages) { - if (!message.duplicate && - !EntityFolder.TRASH.equals(message.folderType) && - (!metered || (message.size != null && message.size < download))) { + if (!message.duplicate && !EntityFolder.TRASH.equals(message.folderType)) { count++; single = message; if (!message.ui_seen) { @@ -1426,7 +1424,8 @@ public class FragmentMessages extends FragmentEx { else if (messages.size() == 1) expand = messages.get(0); - if (expand != null) { + if (expand != null && + (expand.content || !metered || (expand.size != null && expand.size < download))) { expanded.add(expand.id); handleExpand(expand.id); }