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

always show verify fingerprint if there is an active otr session

This commit is contained in:
iNPUTmice 2014-10-28 17:15:13 +01:00
parent 7dcce220cb
commit 161623eca2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -569,7 +569,7 @@ public class ConversationFragment extends Fragment {
this.messageListAdapter.notifyDataSetChanged(); this.messageListAdapter.notifyDataSetChanged();
if (conversation.getMode() == Conversation.MODE_SINGLE) { if (conversation.getMode() == Conversation.MODE_SINGLE) {
if (messageList.size() >= 1) { if (messageList.size() >= 1) {
makeFingerprintWarning(conversation.getLatestEncryption()); makeFingerprintWarning();
} }
} else { } else {
if (!conversation.getMucOptions().online() 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() Set<String> knownFingerprints = conversation.getContact()
.getOtrFingerprints(); .getOtrFingerprints();
if ((latestEncryption == Message.ENCRYPTION_OTR) if (conversation.hasValidOtrSession()
&& (conversation.hasValidOtrSession()
&& (!conversation.isMuted()) && (!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,
new OnClickListener() { new OnClickListener() {