diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-01-02 18:37:33 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-01-02 18:37:33 +0100 |
| commit | feaf7f41d3ab9474da64ee59586df5bc85f39931 (patch) | |
| tree | 29414dc9421afa323dbc8b49ccb52ff7d2e156a9 /src/main/java | |
| parent | 9ed435c75ce3440c2acf7caed5e3f345537b2990 (diff) | |
always open account details when scanning one of our own keys
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/StartConversationActivity.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java index 0e148731d..30d7d20a0 100644 --- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java @@ -845,12 +845,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<Contact> contacts = xmppConnectionService.findContacts(invite.getJid()); if (invite.isMuc()) { @@ -871,7 +872,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()); } |