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

Show errors before mute snackbar

Browse source 
See #939
This commit is contained in:
Sam Whited 2015-01-27 08:49:03 -05:00
parent f8b662e7f8
commit 8cbf610bb2
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
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() } else if (!contact.showInRoster()
&& contact && contact
.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) { .getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
@ -667,6 +658,15 @@ public class ConversationFragment extends Fragment {
default: default:
break; 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); conversation.populateWithMessages(ConversationFragment.this.messageList);
for (final Message message : this.messageList) { for (final Message message : this.messageList) {