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
commit f2bf64d19d

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