aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-11 22:49:26 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-11 22:49:26 +0200
commit259bb446cac55ea7367488dfd63eb2b8a3eb6139 (patch)
tree7cbbe509a955bd4b2b1820f33a24d8b8045bd801 /src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
parentc0e0a7086902a9d5cfbe88c4aa220abdf2ee3dde (diff)
first file transfer between gajim and conversations. still a lot to do though
Diffstat (limited to 'src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java')
-rw-r--r--src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index 7105774d..89ff717d 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
@@ -44,7 +44,6 @@ public class JingleConnectionManager {
}
public JingleConnection createNewConnection(Message message) {
- Account account = message.getConversation().getAccount();
JingleConnection connection = new JingleConnection(this);
connection.init(message);
connections.add(connection);
@@ -57,12 +56,6 @@ public class JingleConnectionManager {
return connection;
}
- private String generateInternalId(String account, String counterpart,
- String sid) {
- return account + "#" + counterpart + "#" + sid;
-
- }
-
public XmppConnectionService getXmppConnectionService() {
return this.xmppConnectionService;
}