narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

always open account details when scanning one of our own keys. fixes #2211

Browse source
This commit is contained in:
Daniel Gultsch 2016-12-29 12:50:18 +01:00
parent fcd9ab17fe
commit 40a9f70478
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View file

@ -846,13 +846,14 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
private boolean handleJid(Invite invite) { private boolean handleJid(Invite invite) {
Account account = xmppConnectionService.findAccountByJid(invite.getJid()); Account account = xmppConnectionService.findAccountByJid(invite.getJid());
if (account != null && !account.isOptionSet(Account.OPTION_DISABLED) && invite.hasFingerprints()) { if (account != null && !account.isOptionSet(Account.OPTION_DISABLED)) {
if (xmppConnectionService.verifyFingerprints(account,invite.getFingerprints())) { if (invite.hasFingerprints() && xmppConnectionService.verifyFingerprints(account,invite.getFingerprints())) {
Toast.makeText(this,R.string.verified_fingerprints,Toast.LENGTH_SHORT).show();
}
switchToAccount(account); switchToAccount(account);
finish(); finish();
return true; return true;
} }
}
List<Contact> contacts = xmppConnectionService.findContacts(invite.getJid()); List<Contact> contacts = xmppConnectionService.findContacts(invite.getJid());
if (invite.isMuc()) { if (invite.isMuc()) {
Conversation muc = xmppConnectionService.findFirstMuc(invite.getJid()); Conversation muc = xmppConnectionService.findFirstMuc(invite.getJid());
@ -872,7 +873,9 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
displayVerificationWarningDialog(contact,invite); displayVerificationWarningDialog(contact,invite);
} else { } else {
if (invite.hasFingerprints()) { 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()); switchToConversation(contact, invite.getBody());
} }