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

Improved auto close

This commit is contained in:
M66B 2018-11-24 16:58:39 +01:00
parent d815016974
commit 9b0a7800ac
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ public class FragmentMessages extends FragmentEx {
private SelectionTracker<Long> selectionTracker = null; private SelectionTracker<Long> selectionTracker = null;
private LiveData<PagedList<TupleMessageEx>> messages = null; private LiveData<PagedList<TupleMessageEx>> messages = null;
private int autoCount = 0; private int autoCloseCount = 0;
private boolean autoExpand = true; private boolean autoExpand = true;
private List<Long> expanded = new ArrayList<>(); private List<Long> expanded = new ArrayList<>();
private List<Long> addresses = new ArrayList<>(); private List<Long> addresses = new ArrayList<>();
@ -853,7 +853,7 @@ public class FragmentMessages extends FragmentEx {
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putBoolean("autoExpand", autoExpand); outState.putBoolean("autoExpand", autoExpand);
outState.putInt("autoCount", autoCount); outState.putInt("autoCloseCount", autoCloseCount);
outState.putLongArray("expanded", Helper.toLongArray(expanded)); outState.putLongArray("expanded", Helper.toLongArray(expanded));
outState.putLongArray("headers", Helper.toLongArray(headers)); outState.putLongArray("headers", Helper.toLongArray(headers));
outState.putLongArray("images", Helper.toLongArray(images)); outState.putLongArray("images", Helper.toLongArray(images));
@ -867,7 +867,7 @@ public class FragmentMessages extends FragmentEx {
if (savedInstanceState != null) { if (savedInstanceState != null) {
autoExpand = savedInstanceState.getBoolean("autoExpand"); autoExpand = savedInstanceState.getBoolean("autoExpand");
autoCount = savedInstanceState.getInt("autoCount"); autoCloseCount = savedInstanceState.getInt("autoCloseCount");
expanded = Helper.fromLongArray(savedInstanceState.getLongArray("expanded")); expanded = Helper.fromLongArray(savedInstanceState.getLongArray("expanded"));
headers = Helper.fromLongArray(savedInstanceState.getLongArray("headers")); headers = Helper.fromLongArray(savedInstanceState.getLongArray("headers"));
images = Helper.fromLongArray(savedInstanceState.getLongArray("images")); images = Helper.fromLongArray(savedInstanceState.getLongArray("images"));
@ -1303,19 +1303,25 @@ public class FragmentMessages extends FragmentEx {
if (autoExpand) { if (autoExpand) {
autoExpand = false; autoExpand = false;
int count = 0;
int unseen = 0; int unseen = 0;
TupleMessageEx single = null; TupleMessageEx single = null;
TupleMessageEx see = null; TupleMessageEx see = null;
for (TupleMessageEx message : messages) for (TupleMessageEx message : messages) {
if (!message.duplicate && !EntityFolder.TRASH.equals(message.folderType)) { if (!message.duplicate && !EntityFolder.TRASH.equals(message.folderType)) {
autoCount++; count++;
single = message; single = message;
if (!message.ui_seen) { if (!message.ui_seen) {
unseen++; unseen++;
see = message; see = message;
} }
} }
Log.i(Helper.TAG, "Auto count=" + autoCount);
if (!EntityFolder.ARCHIVE.equals(message.folderType) &&
!EntityFolder.SENT.equals(message.folderType) &&
!EntityFolder.TRASH.equals(message.folderType))
autoCloseCount++;
}
// Auto expand when: // Auto expand when:
// - single, non archived/trashed/outgoing message // - single, non archived/trashed/outgoing message
@ -1323,7 +1329,7 @@ public class FragmentMessages extends FragmentEx {
// - sole message // - sole message
TupleMessageEx expand = null; TupleMessageEx expand = null;
if (autoCount == 1) if (count == 1)
expand = single; expand = single;
else if (unseen == 1) else if (unseen == 1)
expand = see; expand = see;
@ -1335,11 +1341,13 @@ public class FragmentMessages extends FragmentEx {
handleExpand(expand.id); handleExpand(expand.id);
} }
} else { } else {
if (autoCount > 0 && autoclose) { if (autoCloseCount > 0 && autoclose) {
int count = 0; int count = 0;
for (int i = 0; i < messages.size(); i++) { for (int i = 0; i < messages.size(); i++) {
TupleMessageEx message = messages.get(i); TupleMessageEx message = messages.get(i);
if (!message.duplicate && !EntityFolder.TRASH.equals(message.folderType)) if (!EntityFolder.ARCHIVE.equals(message.folderType) &&
!EntityFolder.SENT.equals(message.folderType) &&
!EntityFolder.TRASH.equals(message.folderType))
count++; count++;
} }
Log.i(Helper.TAG, "Auto close=" + count); Log.i(Helper.TAG, "Auto close=" + count);