aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-01-28 13:08:26 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-01-28 13:08:26 +0100
commitc237a550932b7e68f2f754b8fe33248ae9f0ee5c (patch)
tree4f9363664167f6dc8489f841d6370da72b3fa685 /src
parent3c64839dafcbaaed9ee0f7ef01afe6516f49020b (diff)
parent8cbf610bb2bf9e30ac45a92323697e53738176ed (diff)
Merge pull request #941 from SamWhited/snackbar_ordering
Show errors before mute snackbar
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java20
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