From 40a9f70478473e7068185ba03b9acbbadb936525 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 29 Dec 2016 12:50:18 +0100 Subject: [PATCH] always open account details when scanning one of our own keys. fixes #2211 --- .../ui/StartConversationActivity.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 507fc92a0..8135fde4f 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -846,12 +846,13 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU private boolean handleJid(Invite invite) { Account account = xmppConnectionService.findAccountByJid(invite.getJid()); - if (account != null && !account.isOptionSet(Account.OPTION_DISABLED) && invite.hasFingerprints()) { - if (xmppConnectionService.verifyFingerprints(account,invite.getFingerprints())) { - switchToAccount(account); - finish(); - return true; + if (account != null && !account.isOptionSet(Account.OPTION_DISABLED)) { + if (invite.hasFingerprints() && xmppConnectionService.verifyFingerprints(account,invite.getFingerprints())) { + Toast.makeText(this,R.string.verified_fingerprints,Toast.LENGTH_SHORT).show(); } + switchToAccount(account); + finish(); + return true; } List contacts = xmppConnectionService.findContacts(invite.getJid()); if (invite.isMuc()) { @@ -872,7 +873,9 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU displayVerificationWarningDialog(contact,invite); } else { if (invite.hasFingerprints()) { - xmppConnectionService.verifyFingerprints(contact, invite.getFingerprints()); + if(xmppConnectionService.verifyFingerprints(contact, invite.getFingerprints())) { + Toast.makeText(this,R.string.verified_fingerprints,Toast.LENGTH_SHORT).show(); + } } switchToConversation(contact, invite.getBody()); }