Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-06 12:54:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed expanding large messages on metered connection

Browse Source
This commit is contained in:
M66B
2018-11-30 10:52:59 +01:00
parent f4cdbbf08d
commit f233ea9007
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -1396,9 +1396,7 @@ public class FragmentMessages extends FragmentEx {
TupleMessageEx single = null; TupleMessageEx single = null;
TupleMessageEx see = null; TupleMessageEx see = null;
for (TupleMessageEx message : messages) { for (TupleMessageEx message : messages) {
if (!message.duplicate && if (!message.duplicate && !EntityFolder.TRASH.equals(message.folderType)) {
!EntityFolder.TRASH.equals(message.folderType) &&
(!metered || (message.size != null && message.size < download))) {
count++; count++;
single = message; single = message;
if (!message.ui_seen) { if (!message.ui_seen) {
@@ -1426,7 +1424,8 @@ public class FragmentMessages extends FragmentEx {
else if (messages.size() == 1) else if (messages.size() == 1)
expand = messages.get(0); expand = messages.get(0);
if (expand != null) { if (expand != null &&
(expand.content || !metered || (expand.size != null && expand.size < download))) {
expanded.add(expand.id); expanded.add(expand.id);
handleExpand(expand.id); handleExpand(expand.id);
} }