From 88c3537b6869996098da25954985fcb0c6971635 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Sun, 16 Nov 2014 00:20:20 +0100 Subject: parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible --- .../conversations/services/XmppConnectionService.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java') diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 0c5dfd96..509030c6 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -491,6 +491,7 @@ public class XmppConnectionService extends Service { this.accounts = databaseBackend.getAccounts(); for (Account account : this.accounts) { + account.initOtrEngine(this); this.databaseBackend.readRoster(account.getRoster()); } this.mergePhoneContactsWithRoster(); @@ -608,8 +609,7 @@ public class XmppConnectionService extends Service { if (message.getCounterpart() != null) { if (message.getEncryption() == Message.ENCRYPTION_OTR) { if (!conv.hasValidOtrSession()) { - conv.startOtrSession(this, message.getCounterpart().getResourcepart(), - true); + conv.startOtrSession(message.getCounterpart().getResourcepart(),true); message.setStatus(Message.STATUS_WAITING); } else if (conv.hasValidOtrSession() && conv.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED) { @@ -628,7 +628,7 @@ public class XmppConnectionService extends Service { } else { if (message.getEncryption() == Message.ENCRYPTION_OTR) { if (!conv.hasValidOtrSession() && (message.getCounterpart() != null)) { - conv.startOtrSession(this, message.getCounterpart().getResourcepart(), true); + conv.startOtrSession(message.getCounterpart().getResourcepart(), true); message.setStatus(Message.STATUS_WAITING); } else if (conv.hasValidOtrSession()) { if (conv.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED) { @@ -672,7 +672,7 @@ public class XmppConnectionService extends Service { } else if (message.getEncryption() == Message.ENCRYPTION_OTR) { if (!conv.hasValidOtrSession() && message.getCounterpart() != null) { - conv.startOtrSession(this, message.getCounterpart().getResourcepart(), false); + conv.startOtrSession(message.getCounterpart().getResourcepart(), false); } } } @@ -709,13 +709,11 @@ public class XmppConnectionService extends Service { if (!message.getConversation().hasValidOtrSession()) { if ((message.getCounterpart() != null) && (presences.has(message.getCounterpart().getResourcepart()))) { - message.getConversation().startOtrSession(this, - message.getCounterpart().getResourcepart(), true); + message.getConversation().startOtrSession(message.getCounterpart().getResourcepart(), true); } else { if (presences.size() == 1) { String presence = presences.asStringArray()[0]; - message.getConversation().startOtrSession(this, - presence, true); + message.getConversation().startOtrSession(presence, true); } } } else { @@ -1061,6 +1059,7 @@ public class XmppConnectionService extends Service { } public void createAccount(Account account) { + account.initOtrEngine(this); databaseBackend.createAccount(account); this.accounts.add(account); this.reconnectAccount(account, false); -- cgit v1.2.3