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

Merge pull request #941 from SamWhited/snackbar_ordering

Browse source 
Show errors before mute snackbar
This commit is contained in:
Daniel Gultsch 2015-01-28 13:08:26 +01:00
parent 3c64839daf 8cbf610bb2
commit c237a55093
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -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