Fixed expanding large messages on metered connection

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

View File

@ -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);
}