Auto expand single starred messages

This commit is contained in:
M66B 2021-02-25 17:26:42 +01:00
parent 6ce301426d
commit fda266da4a
2 changed files with 11 additions and 0 deletions

1
FAQ.md
View File

@ -1986,6 +1986,7 @@ When navigation to a conversation one message will be expanded if:
* There is just one message in the conversation
* There is exactly one unread message in the conversation
* There is exactly one starred (favorite) message in the conversation (from version 1.1508)
There is one exception: the message was not downloaded yet
and the message is too large to download automatically on a metered (mobile) connection.

View File

@ -4776,8 +4776,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
int count = 0;
int unseen = 0;
int flagged = 0;
TupleMessageEx single = null;
TupleMessageEx see = null;
TupleMessageEx flag = null;
for (TupleMessageEx message : messages) {
if (message == null)
continue;
@ -4786,11 +4788,17 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
!EntityFolder.DRAFTS.equals(message.folderType) &&
!EntityFolder.TRASH.equals(message.folderType)) {
count++;
single = message;
if (!message.ui_seen) {
unseen++;
see = message;
}
if (message.ui_flagged) {
flagged++;
flag = message;
}
}
if (message.folder == folder &&
@ -4808,6 +4816,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
expand = single;
else if (unseen == 1)
expand = see;
else if (unseen == 0 && flagged == 1)
expand = flag;
else if (messages.size() == 1)
expand = messages.get(0);
else if (messages.size() > 0) {