From 3821a726440eb880164d1cc2d61ce3a7715f0ddb Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Tue, 21 Oct 2014 19:43:34 +0200
Subject: fixed #564

---
 src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java        | 4 ++--
 src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java | 4 ++--
 src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 330a4ebb..a0b2feb2 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -150,8 +150,8 @@ public class JingleConnection implements Downloadable {
 		return this.sessionId;
 	}
 
-	public String getAccountJid() {
-		return this.account.getFullJid();
+	public Account getAccount() {
+		return this.account;
 	}
 
 	public String getCounterPart() {
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index 40ccbfe3..c8209bd9 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
@@ -36,7 +36,7 @@ public class JingleConnectionManager extends AbstractConnectionManager {
 			connections.add(connection);
 		} else {
 			for (JingleConnection connection : connections) {
-				if (connection.getAccountJid().equals(account.getFullJid())
+				if (connection.getAccount() == account
 						&& connection.getSessionId().equals(
 								packet.getSessionId())
 						&& connection.getCounterPart().equals(packet.getFrom())) {
@@ -136,7 +136,7 @@ public class JingleConnectionManager extends AbstractConnectionManager {
 		}
 		if (sid != null) {
 			for (JingleConnection connection : connections) {
-				if (connection.hasTransportId(sid)) {
+				if (connection.getAccount() == account && connection.hasTransportId(sid)) {
 					JingleTransport transport = connection.getTransport();
 					if (transport instanceof JingleInbandTransport) {
 						JingleInbandTransport inbandTransport = (JingleInbandTransport) transport;
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java b/src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
index f1dd1e51..1da2f0cd 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
@@ -30,11 +30,11 @@ public class JingleSocks5Transport extends JingleTransport {
 			StringBuilder destBuilder = new StringBuilder();
 			destBuilder.append(jingleConnection.getSessionId());
 			if (candidate.isOurs()) {
-				destBuilder.append(jingleConnection.getAccountJid());
+				destBuilder.append(jingleConnection.getAccount().getFullJid());
 				destBuilder.append(jingleConnection.getCounterPart());
 			} else {
 				destBuilder.append(jingleConnection.getCounterPart());
-				destBuilder.append(jingleConnection.getAccountJid());
+				destBuilder.append(jingleConnection.getAccount().getFullJid());
 			}
 			mDigest.reset();
 			this.destination = CryptoHelper.bytesToHex(mDigest
-- 
cgit v1.2.3