Merge pull request #941 from SamWhited/snackbar_ordering

Show errors before mute snackbar

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