mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-28 03:32:15 -05:00
Merge branch 'development' of https://github.com/siacs/Conversations into development
This commit is contained in:
commit
f2bf64d19d
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user