sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'development' of https://github.com/siacs/Conversations into development

This commit is contained in:
iNPUTmice 2015-01-29 23:20:01 +01:00
parent 0eeead495f c237a55093
commit f2bf64d19d
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() } else if (!contact.showInRoster()
&& contact && contact
.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) { .getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
@ -667,7 +658,16 @@ 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) {
if (message.getEncryption() == Message.ENCRYPTION_PGP if (message.getEncryption() == Message.ENCRYPTION_PGP