narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

dismiss snackbar when executing pending action

Browse source
This commit is contained in:
Daniel Gultsch 2018-06-25 20:04:30 +02:00
parent 76fba4c697
commit 23af9183ba
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
View file

@ -136,15 +136,6 @@ public class ConversationsOverviewFragment extends XmppFragment {
boolean isMuc = swipedConversation.peek().getMode() == Conversation.MODE_MULTI;
int title = isMuc ? R.string.title_undo_swipe_out_muc : R.string.title_undo_swipe_out_conversation;
pendingActionHelper.push(() -> {
Conversation c = swipedConversation.pop();
if(c != null){
if (!c.isRead() && c.getMode() == Conversation.MODE_SINGLE) {
return;
}
activity.xmppConnectionService.archiveConversation(c);
}
});
final Snackbar snackbar = Snackbar.make(binding.list, title, 5000)
.setAction(R.string.undo, v -> {
pendingActionHelper.undo();
@ -171,6 +162,20 @@ public class ConversationsOverviewFragment extends XmppFragment {
}
}
});
pendingActionHelper.push(() -> {
if (snackbar.isShownOrQueued()) {
snackbar.dismiss();
}
Conversation c = swipedConversation.pop();
if(c != null){
if (!c.isRead() && c.getMode() == Conversation.MODE_SINGLE) {
return;
}
activity.xmppConnectionService.archiveConversation(c);
}
});
ThemeHelper.fix(snackbar);
snackbar.show();
}