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

Revert "Refactoring" 

This reverts commit d410cae77b.
This commit is contained in:
M66B 2021-11-21 18:25:27 +01:00
parent 62493e0fd3
commit dfa030af02
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2123,9 +2123,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (message == null) if (message == null)
return 0; return 0;
boolean expanded = iProperties.getValue("expanded", message.id); if (experiments &&
iProperties.getValue("expanded", message.id))
if (experiments && expanded)
return makeMovementFlags(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT); return makeMovementFlags(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
if (EntityFolder.OUTBOX.equals(message.folderType)) if (EntityFolder.OUTBOX.equals(message.folderType))
@ -2200,10 +2199,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (message == null) if (message == null)
return; return;
boolean expanded = iProperties.getValue("expanded", message.id);
TupleAccountSwipes swipes; TupleAccountSwipes swipes;
if (experiments && expanded) { if (experiments &&
iProperties.getValue("expanded", message.id)) {
swipes = new TupleAccountSwipes(); swipes = new TupleAccountSwipes();
swipes.swipe_right = EntityMessage.SWIPE_ACTION_REPLY; swipes.swipe_right = EntityMessage.SWIPE_ACTION_REPLY;
swipes.right_type = null; swipes.right_type = null;
@ -2341,9 +2339,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
return; return;
} }
boolean expanded = iProperties.getValue("expanded", message.id); if (experiments &&
iProperties.getValue("expanded", message.id)) {
if (experiments && expanded) {
adapter.notifyItemChanged(pos); adapter.notifyItemChanged(pos);
onMenuReply(message, "reply", null); onMenuReply(message, "reply", null);
return; return;
@ -2430,9 +2427,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (message == null) if (message == null)
return null; return null;
boolean expanded = iProperties.getValue("expanded", message.id); if (!experiments &&
iProperties.getValue("expanded", message.id))
if (!experiments && expanded)
return null; return null;
return message; return message;