diff options
| author | Sam Whited <sam@samwhited.com> | 2015-01-27 08:49:03 -0500 |
|---|---|---|
| committer | Sam Whited <sam@samwhited.com> | 2015-01-27 08:49:03 -0500 |
| commit | 8cbf610bb2bf9e30ac45a92323697e53738176ed (patch) | |
| tree | 5452dc87b207d504626de7a3791b8e2ba6cb0929 /src/main | |
| parent | f8b662e7f8cc11f50063ed7d1b48f91dddb246e5 (diff) | |
Show errors before mute snackbar
See #939
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 49b6d0fb..80ac9da1 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -612,15 +612,6 @@ public class ConversationFragment extends Fragment { } } }); - } else if (this.conversation.isMuted()) { - showSnackbar(R.string.notifications_disabled, R.string.enable, - new OnClickListener() { - - @Override - public void onClick(final View v) { - activity.unmuteConversation(conversation); - } - }); } else if (!contact.showInRoster() && contact .getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) { @@ -667,7 +658,16 @@ public class ConversationFragment extends Fragment { default: break; } - } + } else if (this.conversation.isMuted()) { + showSnackbar(R.string.notifications_disabled, R.string.enable, + new OnClickListener() { + + @Override + public void onClick(final View v) { + activity.unmuteConversation(conversation); + } + }); + } conversation.populateWithMessages(ConversationFragment.this.messageList); for (final Message message : this.messageList) { if (message.getEncryption() == Message.ENCRYPTION_PGP |