From 6cd2ff0d886b03079036570c74ecb70050b1de2d Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 10 Nov 2014 19:23:54 +0100 Subject: initial smp support --- .../eu/siacs/conversations/ui/ConversationFragment.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java') diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 63d740c32..5a5369875 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -680,23 +680,21 @@ public class ConversationFragment extends Fragment { } protected void makeFingerprintWarning() { - Set knownFingerprints = conversation.getContact() - .getOtrFingerprints(); if (conversation.hasValidOtrSession() && (!conversation.isMuted()) - && (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED) && (!knownFingerprints - .contains(conversation.getOtrFingerprint()))) { + && (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED) + && (!conversation.isOtrFingerprintVerified())) { showSnackbar(R.string.unknown_otr_fingerprint, R.string.verify, new OnClickListener() { @Override public void onClick(View v) { if (conversation.getOtrFingerprint() != null) { - AlertDialog dialog = UIHelper - .getVerifyFingerprintDialog( - (ConversationActivity) getActivity(), - conversation, snackbar); - dialog.show(); + Intent intent = new Intent(getActivity(),VerifyOTRActivity.class); + intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT); + intent.putExtra("contact",conversation.getContact().getJid().toBareJid().toString()); + intent.putExtra("account",conversation.getAccount().getJid().toBareJid().toString()); + startActivity(intent); } } }); -- cgit v1.2.3