mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Expand single found message

This commit is contained in:
M66B 2021-04-27 20:06:31 +02:00
parent 19beaaf28a
commit b68cdd342c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4900,10 +4900,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
int count = 0;
int unseen = 0;
int flagged = 0;
int found = 0;
TupleMessageEx single = null;
TupleMessageEx see = null;
TupleMessageEx flag = null;
TupleMessageEx pin = null;
TupleMessageEx foundMessage = null;
for (TupleMessageEx message : messages) {
if (message == null)
continue;
@ -4929,6 +4931,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
(message.id.equals(id) || Objects.equals(message.msgid, msgid)))
pin = message;
if (!message.duplicate && message.ui_found) {
found++;
if (foundMessage == null)
foundMessage = message;
}
if (message.folder == folder &&
!EntityFolder.OUTBOX.equals(message.folderType))
autoCloseCount++;
@ -4940,7 +4948,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
// - sole message
if (autoexpand) {
TupleMessageEx expand = null;
if (pin != null)
if (found > 0) {
if (found == 1)
expand = foundMessage;
} else if (pin != null)
expand = pin;
else if (count == 1)
expand = single;