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

changed order of snackbar hints

This commit is contained in:
iNPUTmice 2014-09-03 18:58:46 +02:00
parent ceddf99aa3
commit f19b1fb823
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -384,7 +384,16 @@ public class ConversationFragment extends Fragment {
final ConversationActivity activity = (ConversationActivity) getActivity(); final ConversationActivity activity = (ConversationActivity) getActivity();
if (this.conversation != null) { if (this.conversation != null) {
final Contact contact = this.conversation.getContact(); final Contact contact = this.conversation.getContact();
if (!contact.showInRoster() if (this.conversation.isMuted()) {
showSnackbar(R.string.notifications_disabled, R.string.enable, new OnClickListener() {
@Override
public void onClick(View v) {
conversation.setMutedTill(0);
updateMessages();
}
});
} else if (!contact.showInRoster()
&& contact && contact
.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) { .getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
showSnackbar(R.string.contact_added_you, R.string.add_back, showSnackbar(R.string.contact_added_you, R.string.add_back,
@ -406,16 +415,6 @@ public class ConversationFragment extends Fragment {
break; break;
} }
} }
if (this.conversation.isMuted()) {
showSnackbar(R.string.notifications_disabled, R.string.enable, new OnClickListener() {
@Override
public void onClick(View v) {
conversation.setMutedTill(0);
updateMessages();
}
});
}
if (this.conversation.getMessages().size() == 0) { if (this.conversation.getMessages().size() == 0) {
this.messageList.clear(); this.messageList.clear();
messagesLoaded = false; messagesLoaded = false;
@ -494,7 +493,7 @@ public class ConversationFragment extends Fragment {
Set<String> knownFingerprints = conversation.getContact() Set<String> knownFingerprints = conversation.getContact()
.getOtrFingerprints(); .getOtrFingerprints();
if ((latestEncryption == Message.ENCRYPTION_OTR) if ((latestEncryption == Message.ENCRYPTION_OTR)
&& (conversation.hasValidOtrSession() && (conversation.hasValidOtrSession() && (!conversation.isMuted())
&& (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED) && (!knownFingerprints && (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED) && (!knownFingerprints
.contains(conversation.getOtrFingerprint())))) { .contains(conversation.getOtrFingerprint())))) {
showSnackbar(R.string.unknown_otr_fingerprint, R.string.verify, showSnackbar(R.string.unknown_otr_fingerprint, R.string.verify,