diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-28 17:15:13 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-28 17:15:13 +0100 |
| commit | 161623eca28a6e80849aeabbd719d349a4696697 (patch) | |
| tree | 1694c9d695548e71e3a6804c4eaec5dff13400d4 /src/eu/siacs | |
| parent | 7dcce220cbbac3a9cd23df825c2a81043fc2f68c (diff) | |
always show verify fingerprint if there is an active otr session
Diffstat (limited to 'src/eu/siacs')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationFragment.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index fe3f79cb..9c0c453e 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -569,7 +569,7 @@ public class ConversationFragment extends Fragment { this.messageListAdapter.notifyDataSetChanged(); if (conversation.getMode() == Conversation.MODE_SINGLE) { if (messageList.size() >= 1) { - makeFingerprintWarning(conversation.getLatestEncryption()); + makeFingerprintWarning(); } } else { if (!conversation.getMucOptions().online() @@ -721,14 +721,13 @@ public class ConversationFragment extends Fragment { } } - protected void makeFingerprintWarning(int latestEncryption) { + protected void makeFingerprintWarning() { Set<String> knownFingerprints = conversation.getContact() .getOtrFingerprints(); - if ((latestEncryption == Message.ENCRYPTION_OTR) - && (conversation.hasValidOtrSession() + if (conversation.hasValidOtrSession() && (!conversation.isMuted()) && (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED) && (!knownFingerprints - .contains(conversation.getOtrFingerprint())))) { + .contains(conversation.getOtrFingerprint()))) { showSnackbar(R.string.unknown_otr_fingerprint, R.string.verify, new OnClickListener() { |