mirror of
https://github.com/moparisthebest/Conversations
synced 2024-12-25 08:58:55 -05:00
always open account details when scanning one of our own keys. fixes #2211
This commit is contained in:
parent
fcd9ab17fe
commit
40a9f70478
@ -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());
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user