mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-22 14:11:00 +00:00
Code Issues Releases Wiki Activity

Fixed auto close lpos

Browse source
This commit is contained in:
M66B 2021-07-20 08:21:40 +02:00
parent d9da8e989d
commit 26c9f6cdcc
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -337,7 +337,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
private Long prev = null; private Long prev = null;
private Long next = null; private Long next = null;
private Long closeId = null; private Long closeId = null;
private boolean closeForward;
private int autoCloseCount = 0; private int autoCloseCount = 0;
private boolean autoExpanded = true; private boolean autoExpanded = true;
@ -4958,7 +4957,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if ((next ? "next" : "previous").equals(onclose)) if ((next ? "next" : "previous").equals(onclose))
if (!exists || id != null) { if (!exists || id != null) {
closeId = id; closeId = id;
closeForward = next;
if (!once) { if (!once) {
once = true; once = true;
loadMessagesNext(top); loadMessagesNext(top);
@ -5483,7 +5481,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean reversed = prefs.getBoolean("reversed", false); boolean reversed = prefs.getBoolean("reversed", false);
navigate(closeId, "previous".equals(onclose) ^ reversed, closeForward); navigate(closeId, "previous".equals(onclose) ^ reversed, null);
} }
} }
} }
@ -5527,7 +5525,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
} }
} }
private void navigate(long id, final boolean left, final boolean forward) { private void navigate(long id, final boolean left, final Boolean forward) {
if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
return; return;
if (navigating) if (navigating)
@ -5569,7 +5567,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
nargs.putString("thread", message.thread); nargs.putString("thread", message.thread);
nargs.putLong("id", message.id); nargs.putLong("id", message.id);
if (lpos != NO_POSITION) if (lpos != NO_POSITION)
nargs.putInt("lpos", forward ^ reversed ? lpos - 1 : lpos + 1); if (forward == null)
nargs.putInt("lpos", lpos);
else
nargs.putInt("lpos", forward ^ reversed ? lpos + 1 : lpos - 1);
nargs.putBoolean("found", found); nargs.putBoolean("found", found);
nargs.putBoolean("pane", pane); nargs.putBoolean("pane", pane);
nargs.putLong("primary", primary); nargs.putLong("primary", primary);

2
app/src/main/java/eu/faircode/email/FragmentOptions.java
View file

@ -122,7 +122,7 @@ public class FragmentOptions extends FragmentBase {
"background_color", "text_color", "text_size", "text_font", "text_align", "text_separators", "background_color", "text_color", "text_size", "text_font", "text_align", "text_separators",
"collapse_quotes", "image_placeholders", "inline_images", "collapse_quotes", "image_placeholders", "inline_images",
"seekbar", "actionbar", "actionbar_color", "navbar_colorize", "seekbar", "actionbar", "actionbar_color", "navbar_colorize",
"autoscroll", "swipenav", "swipe_close", "swipe_move", "autoexpand", "autoclose", "onclose", "autoscroll", "swipenav", "reversed", "swipe_close", "swipe_move", "autoexpand", "autoclose", "onclose",
"language_detection", "language_detection",
"quick_filter", "quick_scroll", "quick_filter", "quick_scroll",
"experiments", "debug", "experiments", "debug",