msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Force update after swipe to mark read/unread

Browse Source
pull/214/head
M66B 2 years ago
parent 5ea6222bcd
commit cf7b1040f8
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

@ -1552,7 +1552,7 @@ public class FragmentMessages extends FragmentBase
@Override @Override
public void onClick(View v) { public void onClick(View v) {
boolean more_clear = prefs.getBoolean("more_clear", true); boolean more_clear = prefs.getBoolean("more_clear", true);
onActionSeenSelection(true, null, more_clear); onActionSeenSelection(true, null, false, more_clear);
} }
}); });
@ -1560,7 +1560,7 @@ public class FragmentMessages extends FragmentBase
@Override @Override
public void onClick(View v) { public void onClick(View v) {
boolean more_clear = prefs.getBoolean("more_clear", true); boolean more_clear = prefs.getBoolean("more_clear", true);
onActionSeenSelection(false, null, more_clear); onActionSeenSelection(false, null, false, more_clear);
} }
}); });
@ -3173,7 +3173,7 @@ public class FragmentMessages extends FragmentBase
redraw(pos); redraw(pos);
onSwipeAsk(message, viewHolder); onSwipeAsk(message, viewHolder);
} else if (EntityMessage.SWIPE_ACTION_SEEN.equals(action)) } else if (EntityMessage.SWIPE_ACTION_SEEN.equals(action))
onActionSeenSelection(message.unseen > 0, message.id, false); onActionSeenSelection(message.unseen > 0, message.id, true, false);
else if (EntityMessage.SWIPE_ACTION_FLAG.equals(action)) else if (EntityMessage.SWIPE_ACTION_FLAG.equals(action))
onActionFlagSelection(!message.ui_flagged, Color.TRANSPARENT, message.id, false); onActionFlagSelection(!message.ui_flagged, Color.TRANSPARENT, message.id, false);
else if (EntityMessage.SWIPE_ACTION_SNOOZE.equals(action)) else if (EntityMessage.SWIPE_ACTION_SNOOZE.equals(action))
@ -3292,10 +3292,10 @@ public class FragmentMessages extends FragmentBase
public boolean onMenuItemClick(MenuItem target) { public boolean onMenuItemClick(MenuItem target) {
int itemId = target.getItemId(); int itemId = target.getItemId();
if (itemId == R.string.title_seen) { if (itemId == R.string.title_seen) {
onActionSeenSelection(true, message.id, false); onActionSeenSelection(true, message.id, false, false);
return true; return true;
} else if (itemId == R.string.title_unseen) { } else if (itemId == R.string.title_unseen) {
onActionSeenSelection(false, message.id, false); onActionSeenSelection(false, message.id, false, false);
return true; return true;
} else if (itemId == R.string.title_flag) { } else if (itemId == R.string.title_flag) {
onActionFlagSelection(true, Color.TRANSPARENT, message.id, false); onActionFlagSelection(true, Color.TRANSPARENT, message.id, false);
@ -4173,10 +4173,10 @@ public class FragmentMessages extends FragmentBase
public boolean onMenuItemClick(MenuItem target) { public boolean onMenuItemClick(MenuItem target) {
int itemId = target.getItemId(); int itemId = target.getItemId();
if (itemId == R.string.title_seen) { if (itemId == R.string.title_seen) {
onActionSeenSelection(true, null, false); onActionSeenSelection(true, null, false, false);
return true; return true;
} else if (itemId == R.string.title_unseen) { } else if (itemId == R.string.title_unseen) {
onActionSeenSelection(false, null, false); onActionSeenSelection(false, null, false, false);
return true; return true;
} else if (itemId == R.string.title_snooze) { } else if (itemId == R.string.title_snooze) {
onActionSnoozeSelection(); onActionSnoozeSelection();
@ -4270,9 +4270,10 @@ public class FragmentMessages extends FragmentBase
return ids; return ids;
} }
private void onActionSeenSelection(boolean seen, Long id, boolean clear) { private void onActionSeenSelection(boolean seen, Long id, boolean swiped, boolean clear) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLongArray("ids", id == null ? getSelection() : new long[]{id}); args.putLongArray("ids", id == null ? getSelection() : new long[]{id});
args.putBoolean("swiped", swiped);
args.putBoolean("seen", seen); args.putBoolean("seen", seen);
args.putBoolean("threading", threading && args.putBoolean("threading", threading &&
(id == null || viewType != AdapterMessage.ViewType.THREAD)); (id == null || viewType != AdapterMessage.ViewType.THREAD));
@ -4284,6 +4285,7 @@ public class FragmentMessages extends FragmentBase
@Override @Override
protected Void onExecute(Context context, Bundle args) { protected Void onExecute(Context context, Bundle args) {
long[] ids = args.getLongArray("ids"); long[] ids = args.getLongArray("ids");
boolean swiped = args.getBoolean("swiped");
boolean seen = args.getBoolean("seen"); boolean seen = args.getBoolean("seen");
boolean threading = args.getBoolean("threading"); boolean threading = args.getBoolean("threading");
@ -4296,6 +4298,9 @@ public class FragmentMessages extends FragmentBase
if (message == null) if (message == null)
continue; continue;
if (swiped)
db.message().setMessageUiBusy(message.id, new Date().getTime());
List<EntityMessage> messages = db.message().getMessagesByThread( List<EntityMessage> messages = db.message().getMessagesByThread(
message.account, message.thread, threading ? null : id, seen ? null : message.folder); message.account, message.thread, threading ? null : id, seen ? null : message.folder);
for (EntityMessage threaded : messages) for (EntityMessage threaded : messages)
@ -4315,7 +4320,7 @@ public class FragmentMessages extends FragmentBase
@Override @Override
protected void onExecuted(Bundle args, Void data) { protected void onExecuted(Bundle args, Void data) {
if (id != null && adapter != null) { if (swiped && adapter != null) {
int pos = adapter.getPositionForKey(id); int pos = adapter.getPositionForKey(id);
if (pos != RecyclerView.NO_POSITION) if (pos != RecyclerView.NO_POSITION)
adapter.notifyItemChanged(pos); adapter.notifyItemChanged(pos);

Write Preview
Loading…
Cancel
Save