msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Refactoring

Browse Source
pull/198/head
M66B 4 years ago
parent b68cdd342c
commit 8b3331d341
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

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

@ -4901,10 +4901,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
int unseen = 0; int unseen = 0;
int flagged = 0; int flagged = 0;
int found = 0; int found = 0;
TupleMessageEx single = null; TupleMessageEx singleMessage = null;
TupleMessageEx see = null; TupleMessageEx unseenMessage = null;
TupleMessageEx flag = null; TupleMessageEx flaggedMessage = null;
TupleMessageEx pin = null; TupleMessageEx pinnedMessage = null;
TupleMessageEx foundMessage = null; TupleMessageEx foundMessage = null;
for (TupleMessageEx message : messages) { for (TupleMessageEx message : messages) {
if (message == null) if (message == null)
@ -4915,21 +4915,21 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
!EntityFolder.TRASH.equals(message.folderType)) { !EntityFolder.TRASH.equals(message.folderType)) {
count++; count++;
single = message; singleMessage = message;
if (!message.ui_seen) { if (!message.ui_seen) {
unseen++; unseen++;
see = message; unseenMessage = message;
} }
if (message.ui_flagged) { if (message.ui_flagged) {
flagged++; flagged++;
flag = message; flaggedMessage = message;
} }
} }
if (pinned && if (pinned &&
(message.id.equals(id) || Objects.equals(message.msgid, msgid))) (message.id.equals(id) || Objects.equals(message.msgid, msgid)))
pin = message; pinnedMessage = message;
if (!message.duplicate && message.ui_found) { if (!message.duplicate && message.ui_found) {
found++; found++;
@ -4951,22 +4951,22 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (found > 0) { if (found > 0) {
if (found == 1) if (found == 1)
expand = foundMessage; expand = foundMessage;
} else if (pin != null) } else if (pinnedMessage != null)
expand = pin; expand = pinnedMessage;
else if (count == 1) else if (count == 1)
expand = single; expand = singleMessage;
else if (unseen == 1) else if (unseen == 1)
expand = see; expand = unseenMessage;
else if (unseen == 0 && flagged == 1) else if (unseen == 0 && flagged == 1)
expand = flag; expand = flaggedMessage;
else if (messages.size() == 1) else if (messages.size() == 1)
expand = messages.get(0); expand = messages.get(0);
else if (messages.size() > 0) { else if (messages.size() > 0) {
TupleMessageEx first = messages.get(adapter.getAscending() ? messages.size() - 1 : 0); TupleMessageEx firstMessage = messages.get(adapter.getAscending() ? messages.size() - 1 : 0);
if (first != null && if (firstMessage != null &&
(EntityFolder.OUTBOX.equals(first.folderType) || (EntityFolder.OUTBOX.equals(firstMessage.folderType) ||
(expand_first && unseen == 0 && !EntityFolder.DRAFTS.equals(first.folderType)))) (expand_first && unseen == 0 && !EntityFolder.DRAFTS.equals(firstMessage.folderType))))
expand = first; expand = firstMessage;
} }
if (expand != null && if (expand != null &&

Write Preview
Loading…
Cancel
Save