diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-11-17 22:28:45 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-11-17 22:28:45 +0100 |
commit | 211354ee26f27f24a253ef4e85619435a8f2c942 (patch) | |
tree | 4454e518e5dba957fc8d66312ba0e65fc397a5f4 /src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | |
parent | 7e2e42cb11fdd8fc126795f6005956ccffe084ff (diff) |
put omemo fingerprint in own uri (qr code / nfc)
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index b1609adf..2d24fbbf 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -842,9 +842,13 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU } private boolean handleJid(Invite invite) { - Log.d(Config.LOGTAG,"handling invite for "+invite.getJid()); - for(XmppUri.Fingerprint fp : invite.getFingerprints()) { - Log.d(Config.LOGTAG,fp.toString()); + Account account = xmppConnectionService.findAccountByJid(invite.getJid()); + if (account != null && invite.hasFingerprints()) { + if (xmppConnectionService.verifyFingerprints(account,invite.getFingerprints())) { + switchToAccount(account); + finish(); + return true; + } } List<Contact> contacts = xmppConnectionService.findContacts(invite.getJid()); if (invite.isMuc()) { @@ -864,12 +868,6 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU if (invite.hasFingerprints()) { xmppConnectionService.verifyFingerprints(contact,invite.getFingerprints()); } - /*if (invite.getFingerprint() != null) { - if (contact.addOtrFingerprint(invite.getFingerprint())) { - Log.d(Config.LOGTAG, "added new fingerprint"); - xmppConnectionService.syncRosterToDisk(contact.getAccount()); - } - }*/ switchToConversation(contact); return true; } else { |