From 88c3537b6869996098da25954985fcb0c6971635 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
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

---
 src/main/java/eu/siacs/conversations/entities/Conversation.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java')

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index a9f4c0f1..b1df7ec7 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -240,16 +240,14 @@ public class Conversation extends AbstractEntity {
 		this.mode = mode;
 	}
 
-	public SessionImpl startOtrSession(XmppConnectionService service,
-			String presence, boolean sendStart) {
+	public SessionImpl startOtrSession(String presence, boolean sendStart) {
 		if (this.otrSession != null) {
 			return this.otrSession;
 		} else {
             final SessionID sessionId = new SessionID(this.getContactJid().toBareJid().toString(),
                     presence,
                     "xmpp");
-			this.otrSession = new SessionImpl(sessionId, getAccount()
-					.getOtrEngine(service));
+			this.otrSession = new SessionImpl(sessionId, getAccount().getOtrEngine());
 			try {
 				if (sendStart) {
 					this.otrSession.startSession();
-- 
cgit v1.2.3