From 54f1422d3d076b7e96cf2c03c61cf75affaf43e7 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 18 Nov 2016 22:38:07 +0100
Subject: put omemo fingerprint in own uri (qr code / nfc)

---
 .../pixart/messenger/ui/StartConversationActivity.java   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui')

diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 83ab06b62..cd64149cd 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -841,9 +841,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()) {
@@ -863,12 +867,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 {
-- 
cgit v1.2.3