reformat code

13 files changed, 1902 insertions, 1902 deletions

diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java
index 166fa6c69..6f87db473 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java
@@ -8,57 +8,57 @@ import de.pixart.messenger.xmpp.jid.Jid;
 
 public class JingleCandidate {
 
-	public static int TYPE_UNKNOWN;
-	public static int TYPE_DIRECT = 0;
-	public static int TYPE_PROXY = 1;
-
-	private boolean ours;
-	private boolean usedByCounterpart = false;
-	private String cid;
-	private String host;
-	private int port;
-	private int type;
-	private Jid jid;
-	private int priority;
-
-	public JingleCandidate(String cid, boolean ours) {
-		this.ours = ours;
-		this.cid = cid;
-	}
-
-	public String getCid() {
-		return cid;
-	}
-
-	public void setHost(String host) {
-		this.host = host;
-	}
-
-	public String getHost() {
-		return this.host;
-	}
-
-	public void setJid(final Jid jid) {
-		this.jid = jid;
-	}
-
-	public Jid getJid() {
-		return this.jid;
-	}
-
-	public void setPort(int port) {
-		this.port = port;
-	}
-
-	public int getPort() {
-		return this.port;
-	}
-
-	public void setType(int type) {
-		this.type = type;
-	}
-
-	public void setType(String type) {
+    public static int TYPE_UNKNOWN;
+    public static int TYPE_DIRECT = 0;
+    public static int TYPE_PROXY = 1;
+
+    private boolean ours;
+    private boolean usedByCounterpart = false;
+    private String cid;
+    private String host;
+    private int port;
+    private int type;
+    private Jid jid;
+    private int priority;
+
+    public JingleCandidate(String cid, boolean ours) {
+        this.ours = ours;
+        this.cid = cid;
+    }
+
+    public String getCid() {
+        return cid;
+    }
+
+    public void setHost(String host) {
+        this.host = host;
+    }
+
+    public String getHost() {
+        return this.host;
+    }
+
+    public void setJid(final Jid jid) {
+        this.jid = jid;
+    }
+
+    public Jid getJid() {
+        return this.jid;
+    }
+
+    public void setPort(int port) {
+        this.port = port;
+    }
+
+    public int getPort() {
+        return this.port;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public void setType(String type) {
         switch (type) {
             case "proxy":
                 this.type = TYPE_PROXY;
@@ -70,78 +70,78 @@ public class JingleCandidate {
                 this.type = TYPE_UNKNOWN;
                 break;
         }
-	}
-
-	public void setPriority(int i) {
-		this.priority = i;
-	}
-
-	public int getPriority() {
-		return this.priority;
-	}
-
-	public boolean equals(JingleCandidate other) {
-		return this.getCid().equals(other.getCid());
-	}
-
-	public boolean equalValues(JingleCandidate other) {
-		return other != null && other.getHost().equals(this.getHost()) && (other.getPort() == this.getPort());
-	}
-
-	public boolean isOurs() {
-		return ours;
-	}
-
-	public int getType() {
-		return this.type;
-	}
-
-	public static List<JingleCandidate> parse(List<Element> canditates) {
-		List<JingleCandidate> parsedCandidates = new ArrayList<>();
-		for (Element c : canditates) {
-			parsedCandidates.add(JingleCandidate.parse(c));
-		}
-		return parsedCandidates;
-	}
-
-	public static JingleCandidate parse(Element candidate) {
-		JingleCandidate parsedCandidate = new JingleCandidate(
-				candidate.getAttribute("cid"), false);
-		parsedCandidate.setHost(candidate.getAttribute("host"));
-		parsedCandidate.setJid(candidate.getAttributeAsJid("jid"));
-		parsedCandidate.setType(candidate.getAttribute("type"));
-		parsedCandidate.setPriority(Integer.parseInt(candidate
-				.getAttribute("priority")));
-		parsedCandidate
-				.setPort(Integer.parseInt(candidate.getAttribute("port")));
-		return parsedCandidate;
-	}
-
-	public Element toElement() {
-		Element element = new Element("candidate");
-		element.setAttribute("cid", this.getCid());
-		element.setAttribute("host", this.getHost());
-		element.setAttribute("port", Integer.toString(this.getPort()));
-		element.setAttribute("jid", this.getJid().toString());
-		element.setAttribute("priority", Integer.toString(this.getPriority()));
-		if (this.getType() == TYPE_DIRECT) {
-			element.setAttribute("type", "direct");
-		} else if (this.getType() == TYPE_PROXY) {
-			element.setAttribute("type", "proxy");
-		}
-		return element;
-	}
-
-	public void flagAsUsedByCounterpart() {
-		this.usedByCounterpart = true;
-	}
-
-	public boolean isUsedByCounterpart() {
-		return this.usedByCounterpart;
-	}
-
-	public String toString() {
-		return this.getHost() + ":" + this.getPort() + " (prio="
-				+ this.getPriority() + ")";
-	}
+    }
+
+    public void setPriority(int i) {
+        this.priority = i;
+    }
+
+    public int getPriority() {
+        return this.priority;
+    }
+
+    public boolean equals(JingleCandidate other) {
+        return this.getCid().equals(other.getCid());
+    }
+
+    public boolean equalValues(JingleCandidate other) {
+        return other != null && other.getHost().equals(this.getHost()) && (other.getPort() == this.getPort());
+    }
+
+    public boolean isOurs() {
+        return ours;
+    }
+
+    public int getType() {
+        return this.type;
+    }
+
+    public static List<JingleCandidate> parse(List<Element> canditates) {
+        List<JingleCandidate> parsedCandidates = new ArrayList<>();
+        for (Element c : canditates) {
+            parsedCandidates.add(JingleCandidate.parse(c));
+        }
+        return parsedCandidates;
+    }
+
+    public static JingleCandidate parse(Element candidate) {
+        JingleCandidate parsedCandidate = new JingleCandidate(
+                candidate.getAttribute("cid"), false);
+        parsedCandidate.setHost(candidate.getAttribute("host"));
+        parsedCandidate.setJid(candidate.getAttributeAsJid("jid"));
+        parsedCandidate.setType(candidate.getAttribute("type"));
+        parsedCandidate.setPriority(Integer.parseInt(candidate
+                .getAttribute("priority")));
+        parsedCandidate
+                .setPort(Integer.parseInt(candidate.getAttribute("port")));
+        return parsedCandidate;
+    }
+
+    public Element toElement() {
+        Element element = new Element("candidate");
+        element.setAttribute("cid", this.getCid());
+        element.setAttribute("host", this.getHost());
+        element.setAttribute("port", Integer.toString(this.getPort()));
+        element.setAttribute("jid", this.getJid().toString());
+        element.setAttribute("priority", Integer.toString(this.getPriority()));
+        if (this.getType() == TYPE_DIRECT) {
+            element.setAttribute("type", "direct");
+        } else if (this.getType() == TYPE_PROXY) {
+            element.setAttribute("type", "proxy");
+        }
+        return element;
+    }
+
+    public void flagAsUsedByCounterpart() {
+        this.usedByCounterpart = true;
+    }
+
+    public boolean isUsedByCounterpart() {
+        return this.usedByCounterpart;
+    }
+
+    public String toString() {
+        return this.getHost() + ":" + this.getPort() + " (prio="
+                + this.getPriority() + ")";
+    }
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
index 5417b8deb..29b9db382 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
@@ -40,1048 +40,1048 @@ import de.pixart.messenger.xmpp.jingle.stanzas.Reason;
 import de.pixart.messenger.xmpp.stanzas.IqPacket;
 
 public class JingleConnection implements Transferable {
-	private final SimpleDateFormat fileDateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US);
+    private final SimpleDateFormat fileDateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US);
 
-	private JingleConnectionManager mJingleConnectionManager;
-	private XmppConnectionService mXmppConnectionService;
+    private JingleConnectionManager mJingleConnectionManager;
+    private XmppConnectionService mXmppConnectionService;
 
-	protected static final int JINGLE_STATUS_INITIATED = 0;
-	protected static final int JINGLE_STATUS_ACCEPTED = 1;
-	protected static final int JINGLE_STATUS_FINISHED = 4;
-	protected static final int JINGLE_STATUS_TRANSMITTING = 5;
-	protected static final int JINGLE_STATUS_FAILED = 99;
+    protected static final int JINGLE_STATUS_INITIATED = 0;
+    protected static final int JINGLE_STATUS_ACCEPTED = 1;
+    protected static final int JINGLE_STATUS_FINISHED = 4;
+    protected static final int JINGLE_STATUS_TRANSMITTING = 5;
+    protected static final int JINGLE_STATUS_FAILED = 99;
 
-	private Content.Version ftVersion = Content.Version.FT_3;
+    private Content.Version ftVersion = Content.Version.FT_3;
 
-	private int ibbBlockSize = 8192;
+    private int ibbBlockSize = 8192;
 
-	private int mJingleStatus = -1;
-	private int mStatus = Transferable.STATUS_UNKNOWN;
-	private Message message;
-	private String sessionId;
-	private Account account;
-	private Jid initiator;
-	private Jid responder;
-	private List<JingleCandidate> candidates = new ArrayList<>();
-	private ConcurrentHashMap<String, JingleSocks5Transport> connections = new ConcurrentHashMap<>();
+    private int mJingleStatus = -1;
+    private int mStatus = Transferable.STATUS_UNKNOWN;
+    private Message message;
+    private String sessionId;
+    private Account account;
+    private Jid initiator;
+    private Jid responder;
+    private List<JingleCandidate> candidates = new ArrayList<>();
+    private ConcurrentHashMap<String, JingleSocks5Transport> connections = new ConcurrentHashMap<>();
 
-	private String transportId;
-	private Element fileOffer;
-	private DownloadableFile file = null;
+    private String transportId;
+    private Element fileOffer;
+    private DownloadableFile file = null;
 
-	private String contentName;
-	private String contentCreator;
+    private String contentName;
+    private String contentCreator;
 
-	private int mProgress = 0;
+    private int mProgress = 0;
 
-	private boolean receivedCandidate = false;
-	private boolean sentCandidate = false;
+    private boolean receivedCandidate = false;
+    private boolean sentCandidate = false;
 
-	private boolean acceptedAutomatically = false;
+    private boolean acceptedAutomatically = false;
 
-	private XmppAxolotlMessage mXmppAxolotlMessage;
+    private XmppAxolotlMessage mXmppAxolotlMessage;
 
-	private JingleTransport transport = null;
+    private JingleTransport transport = null;
 
-	private OutputStream mFileOutputStream;
-	private InputStream mFileInputStream;
+    private OutputStream mFileOutputStream;
+    private InputStream mFileInputStream;
 
-	private OnIqPacketReceived responseListener = new OnIqPacketReceived() {
+    private OnIqPacketReceived responseListener = new OnIqPacketReceived() {
 
-		@Override
-		public void onIqPacketReceived(Account account, IqPacket packet) {
-			if (packet.getType() != IqPacket.TYPE.RESULT) {
+        @Override
+        public void onIqPacketReceived(Account account, IqPacket packet) {
+            if (packet.getType() != IqPacket.TYPE.RESULT) {
                 fail(IqParser.extractErrorMessage(packet));
-			}
-		}
-	};
-
-	final OnFileTransmissionStatusChanged onFileTransmissionSatusChanged = new OnFileTransmissionStatusChanged() {
-
-		@Override
-		public void onFileTransmitted(DownloadableFile file) {
-			if (responder.equals(account.getJid())) {
-				sendSuccess();
-				mXmppConnectionService.getFileBackend().updateFileParams(message);
-				mXmppConnectionService.databaseBackend.createMessage(message);
-				mXmppConnectionService.markMessage(message,Message.STATUS_RECEIVED);
-				if (acceptedAutomatically) {
-					message.markUnread();
-					if (message.getEncryption() == Message.ENCRYPTION_PGP) {
-						account.getPgpDecryptionService().decrypt(message, true);
-					} else {
-						JingleConnection.this.mXmppConnectionService.getNotificationService().push(message);
-					}
-				}
-			} else {
-				if (message.getEncryption() == Message.ENCRYPTION_PGP) {
-					account.getPgpDecryptionService().decrypt(message, false);
-				}
-				if (message.getEncryption() == Message.ENCRYPTION_PGP || message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
-					file.delete();
-				}
-			}
-			Log.d(Config.LOGTAG,"successfully transmitted file:" + file.getAbsolutePath()+" ("+file.getSha1Sum()+")");
-			if (message.getEncryption() != Message.ENCRYPTION_PGP) {
-				mXmppConnectionService.getFileBackend().updateMediaScanner(file);
-			}
-		}
-
-		@Override
-		public void onFileTransferAborted() {
-			JingleConnection.this.sendCancel();
-			JingleConnection.this.fail();
-		}
-	};
-
-	public InputStream getFileInputStream() {
-		return this.mFileInputStream;
-	}
-
-	public OutputStream getFileOutputStream() {
-		return this.mFileOutputStream;
-	}
-
-	private OnProxyActivated onProxyActivated = new OnProxyActivated() {
-
-		@Override
-		public void success() {
-			if (initiator.equals(account.getJid())) {
-				Log.d(Config.LOGTAG, "we were initiating. sending file");
-				transport.send(file, onFileTransmissionSatusChanged);
-			} else {
-				transport.receive(file, onFileTransmissionSatusChanged);
-				Log.d(Config.LOGTAG, "we were responding. receiving file");
-			}
-		}
-
-		@Override
-		public void failed() {
-			Log.d(Config.LOGTAG, "proxy activation failed");
-		}
-	};
-
-	public JingleConnection(JingleConnectionManager mJingleConnectionManager) {
-		this.mJingleConnectionManager = mJingleConnectionManager;
-		this.mXmppConnectionService = mJingleConnectionManager
-				.getXmppConnectionService();
-	}
-
-	public String getSessionId() {
-		return this.sessionId;
-	}
-
-	public Account getAccount() {
-		return this.account;
-	}
-
-	public Jid getCounterPart() {
-		return this.message.getCounterpart();
-	}
-
-	public void deliverPacket(JinglePacket packet) {
-		boolean returnResult = true;
-		if (packet.isAction("session-terminate")) {
-			Reason reason = packet.getReason();
-			if (reason != null) {
-				if (reason.hasChild("cancel")) {
-					this.fail();
-				} else if (reason.hasChild("success")) {
-					this.receiveSuccess();
-				} else {
-					this.fail();
-				}
-			} else {
-				this.fail();
-			}
-		} else if (packet.isAction("session-accept")) {
-			returnResult = receiveAccept(packet);
-		} else if (packet.isAction("transport-info")) {
-			returnResult = receiveTransportInfo(packet);
-		} else if (packet.isAction("transport-replace")) {
-			if (packet.getJingleContent().hasIbbTransport()) {
-				returnResult = this.receiveFallbackToIbb(packet);
-			} else {
-				returnResult = false;
-				Log.d(Config.LOGTAG, "trying to fallback to something unknown"
-						+ packet.toString());
-			}
-		} else if (packet.isAction("transport-accept")) {
-			returnResult = this.receiveTransportAccept(packet);
-		} else {
-			Log.d(Config.LOGTAG, "packet arrived in connection. action was "
-					+ packet.getAction());
-			returnResult = false;
-		}
-		IqPacket response;
-		if (returnResult) {
-			response = packet.generateResponse(IqPacket.TYPE.RESULT);
-
-		} else {
-			response = packet.generateResponse(IqPacket.TYPE.ERROR);
-		}
-		mXmppConnectionService.sendIqPacket(account,response,null);
-	}
-
-	public void init(final Message message) {
-		if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
-			Conversation conversation = message.getConversation();
-			conversation.getAccount().getAxolotlService().prepareKeyTransportMessage(conversation, new OnMessageCreatedCallback() {
-				@Override
-				public void run(XmppAxolotlMessage xmppAxolotlMessage) {
-					if (xmppAxolotlMessage != null) {
-						init(message, xmppAxolotlMessage);
-					} else {
-						fail();
-					}
-				}
-			});
-		} else {
-			init(message, null);
-		}
-	}
-
-	private void init(Message message, XmppAxolotlMessage xmppAxolotlMessage) {
-		this.mXmppAxolotlMessage = xmppAxolotlMessage;
-		this.contentCreator = "initiator";
-		this.contentName = this.mJingleConnectionManager.nextRandomId();
-		this.message = message;
-		this.account = message.getConversation().getAccount();
-		upgradeNamespace();
-		this.message.setTransferable(this);
-		this.mStatus = Transferable.STATUS_UPLOADING;
-		this.initiator = this.account.getJid();
-		this.responder = this.message.getCounterpart();
-		this.sessionId = this.mJingleConnectionManager.nextRandomId();
-		this.transportId = this.mJingleConnectionManager.nextRandomId();
-		if (this.candidates.size() > 0) {
-			this.sendInitRequest();
-		} else {
-			this.mJingleConnectionManager.getPrimaryCandidate(account,
-					new OnPrimaryCandidateFound() {
-
-						@Override
-						public void onPrimaryCandidateFound(boolean success,
-															final JingleCandidate candidate) {
-							if (success) {
-								final JingleSocks5Transport socksConnection = new JingleSocks5Transport(
-										JingleConnection.this, candidate);
-								connections.put(candidate.getCid(),
-										socksConnection);
-								socksConnection
-										.connect(new OnTransportConnected() {
-
-											@Override
-											public void failed() {
-												Log.d(Config.LOGTAG,
-														"connection to our own primary candidete failed");
-												sendInitRequest();
-											}
-
-											@Override
-											public void established() {
-												Log.d(Config.LOGTAG,
-														"successfully connected to our own primary candidate");
-												mergeCandidate(candidate);
-												sendInitRequest();
-											}
-										});
-								mergeCandidate(candidate);
-							} else {
-								Log.d(Config.LOGTAG, "no primary candidate of our own was found");
-								sendInitRequest();
-							}
-						}
-					});
-		}
-
-	}
-
-	private void upgradeNamespace() {
-		Jid jid = this.message.getCounterpart();
-		String resource = jid != null ?jid.getResourcepart() : null;
-		if (resource != null) {
-			Presence presence = this.account.getRoster().getContact(jid).getPresences().getPresences().get(resource);
-			ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null;
-			if (result != null) {
-				List<String> features = result.getFeatures();
-				if (features.contains(Content.Version.FT_4.getNamespace())) {
-					this.ftVersion = Content.Version.FT_4;
-				}
-			}
-		}
-	}
-
-	public void init(Account account, JinglePacket packet) {
-		this.mJingleStatus = JINGLE_STATUS_INITIATED;
-		Conversation conversation = this.mXmppConnectionService
-				.findOrCreateConversation(account,
-						packet.getFrom().toBareJid(), false);
-		this.message = new Message(conversation, "", Message.ENCRYPTION_NONE);
-		this.message.setStatus(Message.STATUS_RECEIVED);
-		this.mStatus = Transferable.STATUS_OFFER;
-		this.message.setTransferable(this);
+            }
+        }
+    };
+
+    final OnFileTransmissionStatusChanged onFileTransmissionSatusChanged = new OnFileTransmissionStatusChanged() {
+
+        @Override
+        public void onFileTransmitted(DownloadableFile file) {
+            if (responder.equals(account.getJid())) {
+                sendSuccess();
+                mXmppConnectionService.getFileBackend().updateFileParams(message);
+                mXmppConnectionService.databaseBackend.createMessage(message);
+                mXmppConnectionService.markMessage(message, Message.STATUS_RECEIVED);
+                if (acceptedAutomatically) {
+                    message.markUnread();
+                    if (message.getEncryption() == Message.ENCRYPTION_PGP) {
+                        account.getPgpDecryptionService().decrypt(message, true);
+                    } else {
+                        JingleConnection.this.mXmppConnectionService.getNotificationService().push(message);
+                    }
+                }
+            } else {
+                if (message.getEncryption() == Message.ENCRYPTION_PGP) {
+                    account.getPgpDecryptionService().decrypt(message, false);
+                }
+                if (message.getEncryption() == Message.ENCRYPTION_PGP || message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
+                    file.delete();
+                }
+            }
+            Log.d(Config.LOGTAG, "successfully transmitted file:" + file.getAbsolutePath() + " (" + file.getSha1Sum() + ")");
+            if (message.getEncryption() != Message.ENCRYPTION_PGP) {
+                mXmppConnectionService.getFileBackend().updateMediaScanner(file);
+            }
+        }
+
+        @Override
+        public void onFileTransferAborted() {
+            JingleConnection.this.sendCancel();
+            JingleConnection.this.fail();
+        }
+    };
+
+    public InputStream getFileInputStream() {
+        return this.mFileInputStream;
+    }
+
+    public OutputStream getFileOutputStream() {
+        return this.mFileOutputStream;
+    }
+
+    private OnProxyActivated onProxyActivated = new OnProxyActivated() {
+
+        @Override
+        public void success() {
+            if (initiator.equals(account.getJid())) {
+                Log.d(Config.LOGTAG, "we were initiating. sending file");
+                transport.send(file, onFileTransmissionSatusChanged);
+            } else {
+                transport.receive(file, onFileTransmissionSatusChanged);
+                Log.d(Config.LOGTAG, "we were responding. receiving file");
+            }
+        }
+
+        @Override
+        public void failed() {
+            Log.d(Config.LOGTAG, "proxy activation failed");
+        }
+    };
+
+    public JingleConnection(JingleConnectionManager mJingleConnectionManager) {
+        this.mJingleConnectionManager = mJingleConnectionManager;
+        this.mXmppConnectionService = mJingleConnectionManager
+                .getXmppConnectionService();
+    }
+
+    public String getSessionId() {
+        return this.sessionId;
+    }
+
+    public Account getAccount() {
+        return this.account;
+    }
+
+    public Jid getCounterPart() {
+        return this.message.getCounterpart();
+    }
+
+    public void deliverPacket(JinglePacket packet) {
+        boolean returnResult = true;
+        if (packet.isAction("session-terminate")) {
+            Reason reason = packet.getReason();
+            if (reason != null) {
+                if (reason.hasChild("cancel")) {
+                    this.fail();
+                } else if (reason.hasChild("success")) {
+                    this.receiveSuccess();
+                } else {
+                    this.fail();
+                }
+            } else {
+                this.fail();
+            }
+        } else if (packet.isAction("session-accept")) {
+            returnResult = receiveAccept(packet);
+        } else if (packet.isAction("transport-info")) {
+            returnResult = receiveTransportInfo(packet);
+        } else if (packet.isAction("transport-replace")) {
+            if (packet.getJingleContent().hasIbbTransport()) {
+                returnResult = this.receiveFallbackToIbb(packet);
+            } else {
+                returnResult = false;
+                Log.d(Config.LOGTAG, "trying to fallback to something unknown"
+                        + packet.toString());
+            }
+        } else if (packet.isAction("transport-accept")) {
+            returnResult = this.receiveTransportAccept(packet);
+        } else {
+            Log.d(Config.LOGTAG, "packet arrived in connection. action was "
+                    + packet.getAction());
+            returnResult = false;
+        }
+        IqPacket response;
+        if (returnResult) {
+            response = packet.generateResponse(IqPacket.TYPE.RESULT);
+
+        } else {
+            response = packet.generateResponse(IqPacket.TYPE.ERROR);
+        }
+        mXmppConnectionService.sendIqPacket(account, response, null);
+    }
+
+    public void init(final Message message) {
+        if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
+            Conversation conversation = message.getConversation();
+            conversation.getAccount().getAxolotlService().prepareKeyTransportMessage(conversation, new OnMessageCreatedCallback() {
+                @Override
+                public void run(XmppAxolotlMessage xmppAxolotlMessage) {
+                    if (xmppAxolotlMessage != null) {
+                        init(message, xmppAxolotlMessage);
+                    } else {
+                        fail();
+                    }
+                }
+            });
+        } else {
+            init(message, null);
+        }
+    }
+
+    private void init(Message message, XmppAxolotlMessage xmppAxolotlMessage) {
+        this.mXmppAxolotlMessage = xmppAxolotlMessage;
+        this.contentCreator = "initiator";
+        this.contentName = this.mJingleConnectionManager.nextRandomId();
+        this.message = message;
+        this.account = message.getConversation().getAccount();
+        upgradeNamespace();
+        this.message.setTransferable(this);
+        this.mStatus = Transferable.STATUS_UPLOADING;
+        this.initiator = this.account.getJid();
+        this.responder = this.message.getCounterpart();
+        this.sessionId = this.mJingleConnectionManager.nextRandomId();
+        this.transportId = this.mJingleConnectionManager.nextRandomId();
+        if (this.candidates.size() > 0) {
+            this.sendInitRequest();
+        } else {
+            this.mJingleConnectionManager.getPrimaryCandidate(account,
+                    new OnPrimaryCandidateFound() {
+
+                        @Override
+                        public void onPrimaryCandidateFound(boolean success,
+                                                            final JingleCandidate candidate) {
+                            if (success) {
+                                final JingleSocks5Transport socksConnection = new JingleSocks5Transport(
+                                        JingleConnection.this, candidate);
+                                connections.put(candidate.getCid(),
+                                        socksConnection);
+                                socksConnection
+                                        .connect(new OnTransportConnected() {
+
+                                            @Override
+                                            public void failed() {
+                                                Log.d(Config.LOGTAG,
+                                                        "connection to our own primary candidete failed");
+                                                sendInitRequest();
+                                            }
+
+                                            @Override
+                                            public void established() {
+                                                Log.d(Config.LOGTAG,
+                                                        "successfully connected to our own primary candidate");
+                                                mergeCandidate(candidate);
+                                                sendInitRequest();
+                                            }
+                                        });
+                                mergeCandidate(candidate);
+                            } else {
+                                Log.d(Config.LOGTAG, "no primary candidate of our own was found");
+                                sendInitRequest();
+                            }
+                        }
+                    });
+        }
+
+    }
+
+    private void upgradeNamespace() {
+        Jid jid = this.message.getCounterpart();
+        String resource = jid != null ? jid.getResourcepart() : null;
+        if (resource != null) {
+            Presence presence = this.account.getRoster().getContact(jid).getPresences().getPresences().get(resource);
+            ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null;
+            if (result != null) {
+                List<String> features = result.getFeatures();
+                if (features.contains(Content.Version.FT_4.getNamespace())) {
+                    this.ftVersion = Content.Version.FT_4;
+                }
+            }
+        }
+    }
+
+    public void init(Account account, JinglePacket packet) {
+        this.mJingleStatus = JINGLE_STATUS_INITIATED;
+        Conversation conversation = this.mXmppConnectionService
+                .findOrCreateConversation(account,
+                        packet.getFrom().toBareJid(), false);
+        this.message = new Message(conversation, "", Message.ENCRYPTION_NONE);
+        this.message.setStatus(Message.STATUS_RECEIVED);
+        this.mStatus = Transferable.STATUS_OFFER;
+        this.message.setTransferable(this);
         final Jid from = packet.getFrom();
-		this.message.setCounterpart(from);
-		this.account = account;
-		this.initiator = packet.getFrom();
-		this.responder = this.account.getJid();
-		this.sessionId = packet.getSessionId();
-		Content content = packet.getJingleContent();
-		this.contentCreator = content.getAttribute("creator");
-		this.contentName = content.getAttribute("name");
-		this.transportId = content.getTransportId();
-		this.mergeCandidates(JingleCandidate.parse(content.socks5transport().getChildren()));
-		this.ftVersion = content.getVersion();
-		if (ftVersion == null) {
-			this.sendCancel();
-			this.fail();
-			return;
-		}
-		this.fileOffer = content.getFileOffer(this.ftVersion);
-
-		mXmppConnectionService.sendIqPacket(account,packet.generateResponse(IqPacket.TYPE.RESULT),null);
-
-		if (fileOffer != null) {
-			Element encrypted = fileOffer.findChild("encrypted", AxolotlService.PEP_PREFIX);
-			if (encrypted != null) {
-				this.mXmppAxolotlMessage = XmppAxolotlMessage.fromElement(encrypted, packet.getFrom().toBareJid());
-			}
-			Element fileSize = fileOffer.findChild("size");
-			Element fileNameElement = fileOffer.findChild("name");
-			if (fileNameElement != null) {
-				String[] filename = fileNameElement.getContent()
-						.toLowerCase(Locale.US).toLowerCase().split("\\.");
-				String filename_new = fileDateFormat.format(new Date(message.getTimeSent()))+"_"+message.getUuid().substring(0,4);
-				String extension = filename[filename.length - 1];
-				if (VALID_IMAGE_EXTENSIONS.contains(extension)) {
-					message.setType(Message.TYPE_IMAGE);
-					message.setRelativeFilePath(filename_new+"."+extension);
-				} else if (VALID_CRYPTO_EXTENSIONS.contains(
-						filename[filename.length - 1])) {
-					if (filename.length == 3) {
-						extension = filename[filename.length - 2];
-						if (VALID_IMAGE_EXTENSIONS.contains(extension)) {
-							message.setType(Message.TYPE_IMAGE);
-							message.setRelativeFilePath(filename_new+"."+extension);
-						} else {
-							message.setType(Message.TYPE_FILE);
-						}
-						if (filename[filename.length - 1].equals("otr")) {
-							message.setEncryption(Message.ENCRYPTION_OTR);
-						} else {
-							message.setEncryption(Message.ENCRYPTION_PGP);
-						}
-					}
-				} else {
-					message.setType(Message.TYPE_FILE);
-				}
-				if (message.getType() == Message.TYPE_FILE) {
-					String suffix = "";
-					if (!fileNameElement.getContent().isEmpty()) {
-						String parts[] = fileNameElement.getContent().split("/");
-						suffix = parts[parts.length - 1];
-						if (message.getEncryption() == Message.ENCRYPTION_OTR  && suffix.endsWith(".otr")) {
-							suffix = suffix.substring(0,suffix.length() - 4);
-						} else if (message.getEncryption() == Message.ENCRYPTION_PGP && (suffix.endsWith(".pgp") || suffix.endsWith(".gpg"))) {
-							suffix = suffix.substring(0,suffix.length() - 4);
-						}
-					}
-					message.setRelativeFilePath(filename_new+"_"+suffix);
-				}
-				long size = Long.parseLong(fileSize.getContent());
-				message.setBody(Long.toString(size));
-				conversation.add(message);
-				mXmppConnectionService.updateConversationUi();
-				if (mJingleConnectionManager.hasStoragePermission()
-						&& size < this.mJingleConnectionManager.getAutoAcceptFileSize()
-						&& mXmppConnectionService.isDataSaverDisabled()) {
-					Log.d(Config.LOGTAG, "auto accepting file from "+ packet.getFrom());
-					this.acceptedAutomatically = true;
-					this.sendAccept();
-				} else {
-					message.markUnread();
-					Log.d(Config.LOGTAG,
-							"not auto accepting new file offer with size: "
-									+ size
-									+ " allowed size:"
-									+ this.mJingleConnectionManager
-											.getAutoAcceptFileSize());
-					this.mXmppConnectionService.getNotificationService().push(message);
-				}
-				this.file = this.mXmppConnectionService.getFileBackend().getFile(message, false);
-				if (mXmppAxolotlMessage != null) {
-					XmppAxolotlMessage.XmppAxolotlKeyTransportMessage transportMessage = account.getAxolotlService().processReceivingKeyTransportMessage(mXmppAxolotlMessage);
-					if (transportMessage != null) {
-						message.setEncryption(Message.ENCRYPTION_AXOLOTL);
-						this.file.setKey(transportMessage.getKey());
-						this.file.setIv(transportMessage.getIv());
-						message.setFingerprint(transportMessage.getFingerprint());
-					} else {
-						Log.d(Config.LOGTAG,"could not process KeyTransportMessage");
-					}
-				} else if (message.getEncryption() == Message.ENCRYPTION_OTR) {
-					byte[] key = conversation.getSymmetricKey();
-					if (key == null) {
-						this.sendCancel();
-						this.fail();
-						return;
-					} else {
-						this.file.setKeyAndIv(key);
-					}
-				}
-				this.mFileOutputStream = AbstractConnectionManager.createOutputStream(this.file,message.getEncryption() == Message.ENCRYPTION_AXOLOTL);
-				if (message.getEncryption() == Message.ENCRYPTION_OTR && Config.REPORT_WRONG_FILESIZE_IN_OTR_JINGLE) {
-					this.file.setExpectedSize((size / 16 + 1) * 16);
-				} else {
-					this.file.setExpectedSize(size);
-				}
-				Log.d(Config.LOGTAG, "receiving file: expecting size of " + this.file.getExpectedSize());
-			} else {
-				this.sendCancel();
-				this.fail();
-			}
-		} else {
-			this.sendCancel();
-			this.fail();
-		}
-	}
-
-	private void sendInitRequest() {
-		JinglePacket packet = this.bootstrapPacket("session-initiate");
-		Content content = new Content(this.contentCreator, this.contentName);
-		if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE) {
-			content.setTransportId(this.transportId);
-			this.file = this.mXmppConnectionService.getFileBackend().getFile(message, false);
-			Pair<InputStream,Integer> pair;
-			try {
-				if (message.getEncryption() == Message.ENCRYPTION_OTR) {
-					Conversation conversation = this.message.getConversation();
-					if (!this.mXmppConnectionService.renewSymmetricKey(conversation)) {
-						Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": could not set symmetric key");
-						cancel();
-					}
-					this.file.setKeyAndIv(conversation.getSymmetricKey());
-					pair = AbstractConnectionManager.createInputStream(this.file, false);
-					this.file.setExpectedSize(pair.second);
-					content.setFileOffer(this.file, true, this.ftVersion);
-				} else if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
-					this.file.setKey(mXmppAxolotlMessage.getInnerKey());
-					this.file.setIv(mXmppAxolotlMessage.getIV());
-					pair = AbstractConnectionManager.createInputStream(this.file, true);
-					this.file.setExpectedSize(pair.second);
-					content.setFileOffer(this.file, false, this.ftVersion).addChild(mXmppAxolotlMessage.toElement());
-				} else {
-					pair = AbstractConnectionManager.createInputStream(this.file, false);
-					this.file.setExpectedSize(pair.second);
-					content.setFileOffer(this.file, false, this.ftVersion);
-				}
-			} catch (FileNotFoundException e) {
-				cancel();
-				return;
-			}
-			this.mFileInputStream = pair.first;
-			content.setTransportId(this.transportId);
-			content.socks5transport().setChildren(getCandidatesAsElements());
-			packet.setContent(content);
-			this.sendJinglePacket(packet,new OnIqPacketReceived() {
-
-				@Override
-				public void onIqPacketReceived(Account account, IqPacket packet) {
-					if (packet.getType() == IqPacket.TYPE.RESULT) {
-						Log.d(Config.LOGTAG,account.getJid().toBareJid()+": other party received offer");
-						mJingleStatus = JINGLE_STATUS_INITIATED;
-						mXmppConnectionService.markMessage(message, Message.STATUS_OFFERED);
-					} else {
-						fail(IqParser.extractErrorMessage(packet));
-					}
-				}
-			});
-
-		}
-	}
-
-	private List<Element> getCandidatesAsElements() {
-		List<Element> elements = new ArrayList<>();
-		for (JingleCandidate c : this.candidates) {
-			if (c.isOurs()) {
-				elements.add(c.toElement());
-			}
-		}
-		return elements;
-	}
-
-	private void sendAccept() {
-		mJingleStatus = JINGLE_STATUS_ACCEPTED;
-		this.mStatus = Transferable.STATUS_DOWNLOADING;
-		mXmppConnectionService.updateConversationUi();
-		this.mJingleConnectionManager.getPrimaryCandidate(this.account, new OnPrimaryCandidateFound() {
-			@Override
-			public void onPrimaryCandidateFound(boolean success, final JingleCandidate candidate) {
-				final JinglePacket packet = bootstrapPacket("session-accept");
-				final Content content = new Content(contentCreator,contentName);
-				content.setFileOffer(fileOffer, ftVersion);
-				content.setTransportId(transportId);
-				if (success && candidate != null && !equalCandidateExists(candidate)) {
-					final JingleSocks5Transport socksConnection = new JingleSocks5Transport(
-							JingleConnection.this,
-							candidate);
-					connections.put(candidate.getCid(), socksConnection);
-					socksConnection.connect(new OnTransportConnected() {
-
-						@Override
-						public void failed() {
-							Log.d(Config.LOGTAG,"connection to our own primary candidate failed");
-							content.socks5transport().setChildren(getCandidatesAsElements());
-							packet.setContent(content);
-							sendJinglePacket(packet);
-							connectNextCandidate();
-						}
-
-						@Override
-						public void established() {
-							Log.d(Config.LOGTAG, "connected to primary candidate");
-							mergeCandidate(candidate);
-							content.socks5transport().setChildren(getCandidatesAsElements());
-							packet.setContent(content);
-							sendJinglePacket(packet);
-							connectNextCandidate();
-						}
-					});
-				} else {
-					Log.d(Config.LOGTAG,"did not find a primary candidate for ourself");
-					content.socks5transport().setChildren(getCandidatesAsElements());
-					packet.setContent(content);
-					sendJinglePacket(packet);
-					connectNextCandidate();
-				}
-			}
-		});
-	}
-
-	private JinglePacket bootstrapPacket(String action) {
-		JinglePacket packet = new JinglePacket();
-		packet.setAction(action);
-		packet.setFrom(account.getJid());
-		packet.setTo(this.message.getCounterpart());
-		packet.setSessionId(this.sessionId);
-		packet.setInitiator(this.initiator);
-		return packet;
-	}
-
-	private void sendJinglePacket(JinglePacket packet) {
-		mXmppConnectionService.sendIqPacket(account,packet,responseListener);
-	}
-
-	private void sendJinglePacket(JinglePacket packet, OnIqPacketReceived callback) {
-		mXmppConnectionService.sendIqPacket(account,packet,callback);
-	}
-
-	private boolean receiveAccept(JinglePacket packet) {
-		Content content = packet.getJingleContent();
-		mergeCandidates(JingleCandidate.parse(content.socks5transport()
-				.getChildren()));
-		this.mJingleStatus = JINGLE_STATUS_ACCEPTED;
-		mXmppConnectionService.markMessage(message, Message.STATUS_UNSEND);
-		this.connectNextCandidate();
-		return true;
-	}
-
-	private boolean receiveTransportInfo(JinglePacket packet) {
-		Content content = packet.getJingleContent();
-		if (content.hasSocks5Transport()) {
-			if (content.socks5transport().hasChild("activated")) {
-				if ((this.transport != null) && (this.transport instanceof JingleSocks5Transport)) {
-					onProxyActivated.success();
-				} else {
-					String cid = content.socks5transport().findChild("activated").getAttribute("cid");
-					Log.d(Config.LOGTAG, "received proxy activated (" + cid
-							+ ")prior to choosing our own transport");
-					JingleSocks5Transport connection = this.connections.get(cid);
-					if (connection != null) {
-						connection.setActivated(true);
-					} else {
-						Log.d(Config.LOGTAG, "activated connection not found");
-						this.sendCancel();
-						this.fail();
-					}
-				}
-				return true;
-			} else if (content.socks5transport().hasChild("proxy-error")) {
-				onProxyActivated.failed();
-				return true;
-			} else if (content.socks5transport().hasChild("candidate-error")) {
-				Log.d(Config.LOGTAG, "received candidate error");
-				this.receivedCandidate = true;
-				if ((mJingleStatus == JINGLE_STATUS_ACCEPTED)
-						&& (this.sentCandidate)) {
-					this.connect();
-				}
-				return true;
-			} else if (content.socks5transport().hasChild("candidate-used")) {
-				String cid = content.socks5transport()
-						.findChild("candidate-used").getAttribute("cid");
-				if (cid != null) {
-					Log.d(Config.LOGTAG, "candidate used by counterpart:" + cid);
-					JingleCandidate candidate = getCandidate(cid);
+        this.message.setCounterpart(from);
+        this.account = account;
+        this.initiator = packet.getFrom();
+        this.responder = this.account.getJid();
+        this.sessionId = packet.getSessionId();
+        Content content = packet.getJingleContent();
+        this.contentCreator = content.getAttribute("creator");
+        this.contentName = content.getAttribute("name");
+        this.transportId = content.getTransportId();
+        this.mergeCandidates(JingleCandidate.parse(content.socks5transport().getChildren()));
+        this.ftVersion = content.getVersion();
+        if (ftVersion == null) {
+            this.sendCancel();
+            this.fail();
+            return;
+        }
+        this.fileOffer = content.getFileOffer(this.ftVersion);
+
+        mXmppConnectionService.sendIqPacket(account, packet.generateResponse(IqPacket.TYPE.RESULT), null);
+
+        if (fileOffer != null) {
+            Element encrypted = fileOffer.findChild("encrypted", AxolotlService.PEP_PREFIX);
+            if (encrypted != null) {
+                this.mXmppAxolotlMessage = XmppAxolotlMessage.fromElement(encrypted, packet.getFrom().toBareJid());
+            }
+            Element fileSize = fileOffer.findChild("size");
+            Element fileNameElement = fileOffer.findChild("name");
+            if (fileNameElement != null) {
+                String[] filename = fileNameElement.getContent()
+                        .toLowerCase(Locale.US).toLowerCase().split("\\.");
+                String filename_new = fileDateFormat.format(new Date(message.getTimeSent())) + "_" + message.getUuid().substring(0, 4);
+                String extension = filename[filename.length - 1];
+                if (VALID_IMAGE_EXTENSIONS.contains(extension)) {
+                    message.setType(Message.TYPE_IMAGE);
+                    message.setRelativeFilePath(filename_new + "." + extension);
+                } else if (VALID_CRYPTO_EXTENSIONS.contains(
+                        filename[filename.length - 1])) {
+                    if (filename.length == 3) {
+                        extension = filename[filename.length - 2];
+                        if (VALID_IMAGE_EXTENSIONS.contains(extension)) {
+                            message.setType(Message.TYPE_IMAGE);
+                            message.setRelativeFilePath(filename_new + "." + extension);
+                        } else {
+                            message.setType(Message.TYPE_FILE);
+                        }
+                        if (filename[filename.length - 1].equals("otr")) {
+                            message.setEncryption(Message.ENCRYPTION_OTR);
+                        } else {
+                            message.setEncryption(Message.ENCRYPTION_PGP);
+                        }
+                    }
+                } else {
+                    message.setType(Message.TYPE_FILE);
+                }
+                if (message.getType() == Message.TYPE_FILE) {
+                    String suffix = "";
+                    if (!fileNameElement.getContent().isEmpty()) {
+                        String parts[] = fileNameElement.getContent().split("/");
+                        suffix = parts[parts.length - 1];
+                        if (message.getEncryption() == Message.ENCRYPTION_OTR && suffix.endsWith(".otr")) {
+                            suffix = suffix.substring(0, suffix.length() - 4);
+                        } else if (message.getEncryption() == Message.ENCRYPTION_PGP && (suffix.endsWith(".pgp") || suffix.endsWith(".gpg"))) {
+                            suffix = suffix.substring(0, suffix.length() - 4);
+                        }
+                    }
+                    message.setRelativeFilePath(filename_new + "_" + suffix);
+                }
+                long size = Long.parseLong(fileSize.getContent());
+                message.setBody(Long.toString(size));
+                conversation.add(message);
+                mXmppConnectionService.updateConversationUi();
+                if (mJingleConnectionManager.hasStoragePermission()
+                        && size < this.mJingleConnectionManager.getAutoAcceptFileSize()
+                        && mXmppConnectionService.isDataSaverDisabled()) {
+                    Log.d(Config.LOGTAG, "auto accepting file from " + packet.getFrom());
+                    this.acceptedAutomatically = true;
+                    this.sendAccept();
+                } else {
+                    message.markUnread();
+                    Log.d(Config.LOGTAG,
+                            "not auto accepting new file offer with size: "
+                                    + size
+                                    + " allowed size:"
+                                    + this.mJingleConnectionManager
+                                    .getAutoAcceptFileSize());
+                    this.mXmppConnectionService.getNotificationService().push(message);
+                }
+                this.file = this.mXmppConnectionService.getFileBackend().getFile(message, false);
+                if (mXmppAxolotlMessage != null) {
+                    XmppAxolotlMessage.XmppAxolotlKeyTransportMessage transportMessage = account.getAxolotlService().processReceivingKeyTransportMessage(mXmppAxolotlMessage);
+                    if (transportMessage != null) {
+                        message.setEncryption(Message.ENCRYPTION_AXOLOTL);
+                        this.file.setKey(transportMessage.getKey());
+                        this.file.setIv(transportMessage.getIv());
+                        message.setFingerprint(transportMessage.getFingerprint());
+                    } else {
+                        Log.d(Config.LOGTAG, "could not process KeyTransportMessage");
+                    }
+                } else if (message.getEncryption() == Message.ENCRYPTION_OTR) {
+                    byte[] key = conversation.getSymmetricKey();
+                    if (key == null) {
+                        this.sendCancel();
+                        this.fail();
+                        return;
+                    } else {
+                        this.file.setKeyAndIv(key);
+                    }
+                }
+                this.mFileOutputStream = AbstractConnectionManager.createOutputStream(this.file, message.getEncryption() == Message.ENCRYPTION_AXOLOTL);
+                if (message.getEncryption() == Message.ENCRYPTION_OTR && Config.REPORT_WRONG_FILESIZE_IN_OTR_JINGLE) {
+                    this.file.setExpectedSize((size / 16 + 1) * 16);
+                } else {
+                    this.file.setExpectedSize(size);
+                }
+                Log.d(Config.LOGTAG, "receiving file: expecting size of " + this.file.getExpectedSize());
+            } else {
+                this.sendCancel();
+                this.fail();
+            }
+        } else {
+            this.sendCancel();
+            this.fail();
+        }
+    }
+
+    private void sendInitRequest() {
+        JinglePacket packet = this.bootstrapPacket("session-initiate");
+        Content content = new Content(this.contentCreator, this.contentName);
+        if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE) {
+            content.setTransportId(this.transportId);
+            this.file = this.mXmppConnectionService.getFileBackend().getFile(message, false);
+            Pair<InputStream, Integer> pair;
+            try {
+                if (message.getEncryption() == Message.ENCRYPTION_OTR) {
+                    Conversation conversation = this.message.getConversation();
+                    if (!this.mXmppConnectionService.renewSymmetricKey(conversation)) {
+                        Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": could not set symmetric key");
+                        cancel();
+                    }
+                    this.file.setKeyAndIv(conversation.getSymmetricKey());
+                    pair = AbstractConnectionManager.createInputStream(this.file, false);
+                    this.file.setExpectedSize(pair.second);
+                    content.setFileOffer(this.file, true, this.ftVersion);
+                } else if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
+                    this.file.setKey(mXmppAxolotlMessage.getInnerKey());
+                    this.file.setIv(mXmppAxolotlMessage.getIV());
+                    pair = AbstractConnectionManager.createInputStream(this.file, true);
+                    this.file.setExpectedSize(pair.second);
+                    content.setFileOffer(this.file, false, this.ftVersion).addChild(mXmppAxolotlMessage.toElement());
+                } else {
+                    pair = AbstractConnectionManager.createInputStream(this.file, false);
+                    this.file.setExpectedSize(pair.second);
+                    content.setFileOffer(this.file, false, this.ftVersion);
+                }
+            } catch (FileNotFoundException e) {
+                cancel();
+                return;
+            }
+            this.mFileInputStream = pair.first;
+            content.setTransportId(this.transportId);
+            content.socks5transport().setChildren(getCandidatesAsElements());
+            packet.setContent(content);
+            this.sendJinglePacket(packet, new OnIqPacketReceived() {
+
+                @Override
+                public void onIqPacketReceived(Account account, IqPacket packet) {
+                    if (packet.getType() == IqPacket.TYPE.RESULT) {
+                        Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": other party received offer");
+                        mJingleStatus = JINGLE_STATUS_INITIATED;
+                        mXmppConnectionService.markMessage(message, Message.STATUS_OFFERED);
+                    } else {
+                        fail(IqParser.extractErrorMessage(packet));
+                    }
+                }
+            });
+
+        }
+    }
+
+    private List<Element> getCandidatesAsElements() {
+        List<Element> elements = new ArrayList<>();
+        for (JingleCandidate c : this.candidates) {
+            if (c.isOurs()) {
+                elements.add(c.toElement());
+            }
+        }
+        return elements;
+    }
+
+    private void sendAccept() {
+        mJingleStatus = JINGLE_STATUS_ACCEPTED;
+        this.mStatus = Transferable.STATUS_DOWNLOADING;
+        mXmppConnectionService.updateConversationUi();
+        this.mJingleConnectionManager.getPrimaryCandidate(this.account, new OnPrimaryCandidateFound() {
+            @Override
+            public void onPrimaryCandidateFound(boolean success, final JingleCandidate candidate) {
+                final JinglePacket packet = bootstrapPacket("session-accept");
+                final Content content = new Content(contentCreator, contentName);
+                content.setFileOffer(fileOffer, ftVersion);
+                content.setTransportId(transportId);
+                if (success && candidate != null && !equalCandidateExists(candidate)) {
+                    final JingleSocks5Transport socksConnection = new JingleSocks5Transport(
+                            JingleConnection.this,
+                            candidate);
+                    connections.put(candidate.getCid(), socksConnection);
+                    socksConnection.connect(new OnTransportConnected() {
+
+                        @Override
+                        public void failed() {
+                            Log.d(Config.LOGTAG, "connection to our own primary candidate failed");
+                            content.socks5transport().setChildren(getCandidatesAsElements());
+                            packet.setContent(content);
+                            sendJinglePacket(packet);
+                            connectNextCandidate();
+                        }
+
+                        @Override
+                        public void established() {
+                            Log.d(Config.LOGTAG, "connected to primary candidate");
+                            mergeCandidate(candidate);
+                            content.socks5transport().setChildren(getCandidatesAsElements());
+                            packet.setContent(content);
+                            sendJinglePacket(packet);
+                            connectNextCandidate();
+                        }
+                    });
+                } else {
+                    Log.d(Config.LOGTAG, "did not find a primary candidate for ourself");
+                    content.socks5transport().setChildren(getCandidatesAsElements());
+                    packet.setContent(content);
+                    sendJinglePacket(packet);
+                    connectNextCandidate();
+                }
+            }
+        });
+    }
+
+    private JinglePacket bootstrapPacket(String action) {
+        JinglePacket packet = new JinglePacket();
+        packet.setAction(action);
+        packet.setFrom(account.getJid());
+        packet.setTo(this.message.getCounterpart());
+        packet.setSessionId(this.sessionId);
+        packet.setInitiator(this.initiator);
+        return packet;
+    }
+
+    private void sendJinglePacket(JinglePacket packet) {
+        mXmppConnectionService.sendIqPacket(account, packet, responseListener);
+    }
+
+    private void sendJinglePacket(JinglePacket packet, OnIqPacketReceived callback) {
+        mXmppConnectionService.sendIqPacket(account, packet, callback);
+    }
+
+    private boolean receiveAccept(JinglePacket packet) {
+        Content content = packet.getJingleContent();
+        mergeCandidates(JingleCandidate.parse(content.socks5transport()
+                .getChildren()));
+        this.mJingleStatus = JINGLE_STATUS_ACCEPTED;
+        mXmppConnectionService.markMessage(message, Message.STATUS_UNSEND);
+        this.connectNextCandidate();
+        return true;
+    }
+
+    private boolean receiveTransportInfo(JinglePacket packet) {
+        Content content = packet.getJingleContent();
+        if (content.hasSocks5Transport()) {
+            if (content.socks5transport().hasChild("activated")) {
+                if ((this.transport != null) && (this.transport instanceof JingleSocks5Transport)) {
+                    onProxyActivated.success();
+                } else {
+                    String cid = content.socks5transport().findChild("activated").getAttribute("cid");
+                    Log.d(Config.LOGTAG, "received proxy activated (" + cid
+                            + ")prior to choosing our own transport");
+                    JingleSocks5Transport connection = this.connections.get(cid);
+                    if (connection != null) {
+                        connection.setActivated(true);
+                    } else {
+                        Log.d(Config.LOGTAG, "activated connection not found");
+                        this.sendCancel();
+                        this.fail();
+                    }
+                }
+                return true;
+            } else if (content.socks5transport().hasChild("proxy-error")) {
+                onProxyActivated.failed();
+                return true;
+            } else if (content.socks5transport().hasChild("candidate-error")) {
+                Log.d(Config.LOGTAG, "received candidate error");
+                this.receivedCandidate = true;
+                if ((mJingleStatus == JINGLE_STATUS_ACCEPTED)
+                        && (this.sentCandidate)) {
+                    this.connect();
+                }
+                return true;
+            } else if (content.socks5transport().hasChild("candidate-used")) {
+                String cid = content.socks5transport()
+                        .findChild("candidate-used").getAttribute("cid");
+                if (cid != null) {
+                    Log.d(Config.LOGTAG, "candidate used by counterpart:" + cid);
+                    JingleCandidate candidate = getCandidate(cid);
                     if (candidate == null) {
-                        Log.d(Config.LOGTAG,"could not find candidate with cid="+cid);
+                        Log.d(Config.LOGTAG, "could not find candidate with cid=" + cid);
                         return false;
                     }
-					candidate.flagAsUsedByCounterpart();
-					this.receivedCandidate = true;
-					if ((mJingleStatus == JINGLE_STATUS_ACCEPTED)
-							&& (this.sentCandidate)) {
-						this.connect();
-					} else {
-						Log.d(Config.LOGTAG,
-								"ignoring because file is already in transmission or we haven't sent our candidate yet");
-					}
-					return true;
-				} else {
-					return false;
-				}
-			} else {
-				return false;
-			}
-		} else {
-			return true;
-		}
-	}
-
-	private void connect() {
-		final JingleSocks5Transport connection = chooseConnection();
-		this.transport = connection;
-		if (connection == null) {
-			Log.d(Config.LOGTAG, "could not find suitable candidate");
-			this.disconnectSocks5Connections();
-			if (this.initiator.equals(account.getJid())) {
-				this.sendFallbackToIbb();
-			}
-		} else {
-			this.mJingleStatus = JINGLE_STATUS_TRANSMITTING;
-			if (connection.needsActivation()) {
-				if (connection.getCandidate().isOurs()) {
-					final String sid;
-					if (ftVersion == Content.Version.FT_3) {
-						Log.d(Config.LOGTAG,account.getJid().toBareJid()+": use session ID instead of transport ID to activate proxy");
-						sid = getSessionId();
-					} else {
-						sid = getTransportId();
-					}
-					Log.d(Config.LOGTAG, "candidate "
-							+ connection.getCandidate().getCid()
-							+ " was our proxy. going to activate");
-					IqPacket activation = new IqPacket(IqPacket.TYPE.SET);
-					activation.setTo(connection.getCandidate().getJid());
-					activation.query("http://jabber.org/protocol/bytestreams")
-							.setAttribute("sid", sid);
-					activation.query().addChild("activate")
-							.setContent(this.getCounterPart().toString());
-					mXmppConnectionService.sendIqPacket(account,activation,
-							new OnIqPacketReceived() {
-
-								@Override
-								public void onIqPacketReceived(Account account,
-										IqPacket packet) {
-									if (packet.getType() != IqPacket.TYPE.RESULT) {
-										onProxyActivated.failed();
-									} else {
-										onProxyActivated.success();
-										sendProxyActivated(connection.getCandidate().getCid());
-									}
-								}
-							});
-				} else {
-					Log.d(Config.LOGTAG,
-							"candidate "
-									+ connection.getCandidate().getCid()
-									+ " was a proxy. waiting for other party to activate");
-				}
-			} else {
-				if (initiator.equals(account.getJid())) {
-					Log.d(Config.LOGTAG, "we were initiating. sending file");
-					connection.send(file, onFileTransmissionSatusChanged);
-				} else {
-					Log.d(Config.LOGTAG, "we were responding. receiving file");
-					connection.receive(file, onFileTransmissionSatusChanged);
-				}
-			}
-		}
-	}
-
-	private JingleSocks5Transport chooseConnection() {
-		JingleSocks5Transport connection = null;
-		for (Entry<String, JingleSocks5Transport> cursor : connections
-				.entrySet()) {
-			JingleSocks5Transport currentConnection = cursor.getValue();
-			// Log.d(Config.LOGTAG,"comparing candidate: "+currentConnection.getCandidate().toString());
-			if (currentConnection.isEstablished()
-					&& (currentConnection.getCandidate().isUsedByCounterpart() || (!currentConnection
-							.getCandidate().isOurs()))) {
-				// Log.d(Config.LOGTAG,"is usable");
-				if (connection == null) {
-					connection = currentConnection;
-				} else {
-					if (connection.getCandidate().getPriority() < currentConnection
-							.getCandidate().getPriority()) {
-						connection = currentConnection;
-					} else if (connection.getCandidate().getPriority() == currentConnection
-							.getCandidate().getPriority()) {
-						// Log.d(Config.LOGTAG,"found two candidates with same priority");
-						if (initiator.equals(account.getJid())) {
-							if (currentConnection.getCandidate().isOurs()) {
-								connection = currentConnection;
-							}
-						} else {
-							if (!currentConnection.getCandidate().isOurs()) {
-								connection = currentConnection;
-							}
-						}
-					}
-				}
-			}
-		}
-		return connection;
-	}
-
-	private void sendSuccess() {
-		JinglePacket packet = bootstrapPacket("session-terminate");
-		Reason reason = new Reason();
-		reason.addChild("success");
-		packet.setReason(reason);
-		this.sendJinglePacket(packet);
-		this.disconnectSocks5Connections();
-		this.mJingleStatus = JINGLE_STATUS_FINISHED;
-		this.message.setStatus(Message.STATUS_RECEIVED);
-		this.message.setTransferable(null);
-		this.mXmppConnectionService.updateMessage(message);
-		this.mJingleConnectionManager.finishConnection(this);
-	}
-
-	private void sendFallbackToIbb() {
-		Log.d(Config.LOGTAG, "sending fallback to ibb");
-		JinglePacket packet = this.bootstrapPacket("transport-replace");
-		Content content = new Content(this.contentCreator, this.contentName);
-		this.transportId = this.mJingleConnectionManager.nextRandomId();
-		content.setTransportId(this.transportId);
-		content.ibbTransport().setAttribute("block-size",
-				Integer.toString(this.ibbBlockSize));
-		packet.setContent(content);
-		this.sendJinglePacket(packet);
-	}
-
-	private boolean receiveFallbackToIbb(JinglePacket packet) {
-		Log.d(Config.LOGTAG, "receiving fallack to ibb");
-		String receivedBlockSize = packet.getJingleContent().ibbTransport()
-				.getAttribute("block-size");
-		if (receivedBlockSize != null) {
-			int bs = Integer.parseInt(receivedBlockSize);
-			if (bs > this.ibbBlockSize) {
-				this.ibbBlockSize = bs;
-			}
-		}
-		this.transportId = packet.getJingleContent().getTransportId();
-		this.transport = new JingleInbandTransport(this, this.transportId, this.ibbBlockSize);
-		this.transport.receive(file, onFileTransmissionSatusChanged);
-		JinglePacket answer = bootstrapPacket("transport-accept");
-		Content content = new Content("initiator", "a-file-offer");
-		content.setTransportId(this.transportId);
-		content.ibbTransport().setAttribute("block-size",this.ibbBlockSize);
-		answer.setContent(content);
-		this.sendJinglePacket(answer);
-		return true;
-	}
-
-	private boolean receiveTransportAccept(JinglePacket packet) {
-		if (packet.getJingleContent().hasIbbTransport()) {
-			String receivedBlockSize = packet.getJingleContent().ibbTransport()
-					.getAttribute("block-size");
-			if (receivedBlockSize != null) {
-				int bs = Integer.parseInt(receivedBlockSize);
-				if (bs > this.ibbBlockSize) {
-					this.ibbBlockSize = bs;
-				}
-			}
-			this.transport = new JingleInbandTransport(this, this.transportId, this.ibbBlockSize);
-			this.transport.connect(new OnTransportConnected() {
-
-				@Override
-				public void failed() {
-					Log.d(Config.LOGTAG, "ibb open failed");
-				}
-
-				@Override
-				public void established() {
-					JingleConnection.this.transport.send(file,
-							onFileTransmissionSatusChanged);
-				}
-			});
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	private void receiveSuccess() {
-		this.mJingleStatus = JINGLE_STATUS_FINISHED;
-		this.mXmppConnectionService.markMessage(this.message,Message.STATUS_SEND_RECEIVED);
-		this.disconnectSocks5Connections();
-		if (this.transport != null && this.transport instanceof JingleInbandTransport) {
-			this.transport.disconnect();
-		}
-		this.message.setTransferable(null);
-		this.mJingleConnectionManager.finishConnection(this);
-	}
-
-	public void cancel() {
-		this.disconnectSocks5Connections();
-		if (this.transport != null && this.transport instanceof JingleInbandTransport) {
-			this.transport.disconnect();
-		}
-		this.sendCancel();
-		this.mJingleConnectionManager.finishConnection(this);
-		if (this.responder.equals(account.getJid())) {
-			this.message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_FAILED));
-			if (this.file!=null) {
-				file.delete();
-			}
-			this.mXmppConnectionService.updateConversationUi();
-		} else {
-			this.mXmppConnectionService.markMessage(this.message,
-					Message.STATUS_SEND_FAILED);
-			this.message.setTransferable(null);
-		}
-	}
-
-	private void fail() {
+                    candidate.flagAsUsedByCounterpart();
+                    this.receivedCandidate = true;
+                    if ((mJingleStatus == JINGLE_STATUS_ACCEPTED)
+                            && (this.sentCandidate)) {
+                        this.connect();
+                    } else {
+                        Log.d(Config.LOGTAG,
+                                "ignoring because file is already in transmission or we haven't sent our candidate yet");
+                    }
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        } else {
+            return true;
+        }
+    }
+
+    private void connect() {
+        final JingleSocks5Transport connection = chooseConnection();
+        this.transport = connection;
+        if (connection == null) {
+            Log.d(Config.LOGTAG, "could not find suitable candidate");
+            this.disconnectSocks5Connections();
+            if (this.initiator.equals(account.getJid())) {
+                this.sendFallbackToIbb();
+            }
+        } else {
+            this.mJingleStatus = JINGLE_STATUS_TRANSMITTING;
+            if (connection.needsActivation()) {
+                if (connection.getCandidate().isOurs()) {
+                    final String sid;
+                    if (ftVersion == Content.Version.FT_3) {
+                        Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": use session ID instead of transport ID to activate proxy");
+                        sid = getSessionId();
+                    } else {
+                        sid = getTransportId();
+                    }
+                    Log.d(Config.LOGTAG, "candidate "
+                            + connection.getCandidate().getCid()
+                            + " was our proxy. going to activate");
+                    IqPacket activation = new IqPacket(IqPacket.TYPE.SET);
+                    activation.setTo(connection.getCandidate().getJid());
+                    activation.query("http://jabber.org/protocol/bytestreams")
+                            .setAttribute("sid", sid);
+                    activation.query().addChild("activate")
+                            .setContent(this.getCounterPart().toString());
+                    mXmppConnectionService.sendIqPacket(account, activation,
+                            new OnIqPacketReceived() {
+
+                                @Override
+                                public void onIqPacketReceived(Account account,
+                                                               IqPacket packet) {
+                                    if (packet.getType() != IqPacket.TYPE.RESULT) {
+                                        onProxyActivated.failed();
+                                    } else {
+                                        onProxyActivated.success();
+                                        sendProxyActivated(connection.getCandidate().getCid());
+                                    }
+                                }
+                            });
+                } else {
+                    Log.d(Config.LOGTAG,
+                            "candidate "
+                                    + connection.getCandidate().getCid()
+                                    + " was a proxy. waiting for other party to activate");
+                }
+            } else {
+                if (initiator.equals(account.getJid())) {
+                    Log.d(Config.LOGTAG, "we were initiating. sending file");
+                    connection.send(file, onFileTransmissionSatusChanged);
+                } else {
+                    Log.d(Config.LOGTAG, "we were responding. receiving file");
+                    connection.receive(file, onFileTransmissionSatusChanged);
+                }
+            }
+        }
+    }
+
+    private JingleSocks5Transport chooseConnection() {
+        JingleSocks5Transport connection = null;
+        for (Entry<String, JingleSocks5Transport> cursor : connections
+                .entrySet()) {
+            JingleSocks5Transport currentConnection = cursor.getValue();
+            // Log.d(Config.LOGTAG,"comparing candidate: "+currentConnection.getCandidate().toString());
+            if (currentConnection.isEstablished()
+                    && (currentConnection.getCandidate().isUsedByCounterpart() || (!currentConnection
+                    .getCandidate().isOurs()))) {
+                // Log.d(Config.LOGTAG,"is usable");
+                if (connection == null) {
+                    connection = currentConnection;
+                } else {
+                    if (connection.getCandidate().getPriority() < currentConnection
+                            .getCandidate().getPriority()) {
+                        connection = currentConnection;
+                    } else if (connection.getCandidate().getPriority() == currentConnection
+                            .getCandidate().getPriority()) {
+                        // Log.d(Config.LOGTAG,"found two candidates with same priority");
+                        if (initiator.equals(account.getJid())) {
+                            if (currentConnection.getCandidate().isOurs()) {
+                                connection = currentConnection;
+                            }
+                        } else {
+                            if (!currentConnection.getCandidate().isOurs()) {
+                                connection = currentConnection;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return connection;
+    }
+
+    private void sendSuccess() {
+        JinglePacket packet = bootstrapPacket("session-terminate");
+        Reason reason = new Reason();
+        reason.addChild("success");
+        packet.setReason(reason);
+        this.sendJinglePacket(packet);
+        this.disconnectSocks5Connections();
+        this.mJingleStatus = JINGLE_STATUS_FINISHED;
+        this.message.setStatus(Message.STATUS_RECEIVED);
+        this.message.setTransferable(null);
+        this.mXmppConnectionService.updateMessage(message);
+        this.mJingleConnectionManager.finishConnection(this);
+    }
+
+    private void sendFallbackToIbb() {
+        Log.d(Config.LOGTAG, "sending fallback to ibb");
+        JinglePacket packet = this.bootstrapPacket("transport-replace");
+        Content content = new Content(this.contentCreator, this.contentName);
+        this.transportId = this.mJingleConnectionManager.nextRandomId();
+        content.setTransportId(this.transportId);
+        content.ibbTransport().setAttribute("block-size",
+                Integer.toString(this.ibbBlockSize));
+        packet.setContent(content);
+        this.sendJinglePacket(packet);
+    }
+
+    private boolean receiveFallbackToIbb(JinglePacket packet) {
+        Log.d(Config.LOGTAG, "receiving fallack to ibb");
+        String receivedBlockSize = packet.getJingleContent().ibbTransport()
+                .getAttribute("block-size");
+        if (receivedBlockSize != null) {
+            int bs = Integer.parseInt(receivedBlockSize);
+            if (bs > this.ibbBlockSize) {
+                this.ibbBlockSize = bs;
+            }
+        }
+        this.transportId = packet.getJingleContent().getTransportId();
+        this.transport = new JingleInbandTransport(this, this.transportId, this.ibbBlockSize);
+        this.transport.receive(file, onFileTransmissionSatusChanged);
+        JinglePacket answer = bootstrapPacket("transport-accept");
+        Content content = new Content("initiator", "a-file-offer");
+        content.setTransportId(this.transportId);
+        content.ibbTransport().setAttribute("block-size", this.ibbBlockSize);
+        answer.setContent(content);
+        this.sendJinglePacket(answer);
+        return true;
+    }
+
+    private boolean receiveTransportAccept(JinglePacket packet) {
+        if (packet.getJingleContent().hasIbbTransport()) {
+            String receivedBlockSize = packet.getJingleContent().ibbTransport()
+                    .getAttribute("block-size");
+            if (receivedBlockSize != null) {
+                int bs = Integer.parseInt(receivedBlockSize);
+                if (bs > this.ibbBlockSize) {
+                    this.ibbBlockSize = bs;
+                }
+            }
+            this.transport = new JingleInbandTransport(this, this.transportId, this.ibbBlockSize);
+            this.transport.connect(new OnTransportConnected() {
+
+                @Override
+                public void failed() {
+                    Log.d(Config.LOGTAG, "ibb open failed");
+                }
+
+                @Override
+                public void established() {
+                    JingleConnection.this.transport.send(file,
+                            onFileTransmissionSatusChanged);
+                }
+            });
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private void receiveSuccess() {
+        this.mJingleStatus = JINGLE_STATUS_FINISHED;
+        this.mXmppConnectionService.markMessage(this.message, Message.STATUS_SEND_RECEIVED);
+        this.disconnectSocks5Connections();
+        if (this.transport != null && this.transport instanceof JingleInbandTransport) {
+            this.transport.disconnect();
+        }
+        this.message.setTransferable(null);
+        this.mJingleConnectionManager.finishConnection(this);
+    }
+
+    public void cancel() {
+        this.disconnectSocks5Connections();
+        if (this.transport != null && this.transport instanceof JingleInbandTransport) {
+            this.transport.disconnect();
+        }
+        this.sendCancel();
+        this.mJingleConnectionManager.finishConnection(this);
+        if (this.responder.equals(account.getJid())) {
+            this.message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_FAILED));
+            if (this.file != null) {
+                file.delete();
+            }
+            this.mXmppConnectionService.updateConversationUi();
+        } else {
+            this.mXmppConnectionService.markMessage(this.message,
+                    Message.STATUS_SEND_FAILED);
+            this.message.setTransferable(null);
+        }
+    }
+
+    private void fail() {
         fail(null);
     }
 
     private void fail(String errorMessage) {
-		this.mJingleStatus = JINGLE_STATUS_FAILED;
-		this.disconnectSocks5Connections();
-		if (this.transport != null && this.transport instanceof JingleInbandTransport) {
-			this.transport.disconnect();
-		}
-		FileBackend.close(mFileInputStream);
-		FileBackend.close(mFileOutputStream);
-		if (this.message != null) {
-			if (this.responder.equals(account.getJid())) {
-				this.message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_FAILED));
-				if (this.file!=null) {
-					file.delete();
-				}
-				this.mXmppConnectionService.updateConversationUi();
-			} else {
-				this.mXmppConnectionService.markMessage(this.message,
-						Message.STATUS_SEND_FAILED,
+        this.mJingleStatus = JINGLE_STATUS_FAILED;
+        this.disconnectSocks5Connections();
+        if (this.transport != null && this.transport instanceof JingleInbandTransport) {
+            this.transport.disconnect();
+        }
+        FileBackend.close(mFileInputStream);
+        FileBackend.close(mFileOutputStream);
+        if (this.message != null) {
+            if (this.responder.equals(account.getJid())) {
+                this.message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_FAILED));
+                if (this.file != null) {
+                    file.delete();
+                }
+                this.mXmppConnectionService.updateConversationUi();
+            } else {
+                this.mXmppConnectionService.markMessage(this.message,
+                        Message.STATUS_SEND_FAILED,
                         errorMessage);
-				this.message.setTransferable(null);
-			}
-		}
-		this.mJingleConnectionManager.finishConnection(this);
-	}
-
-	private void sendCancel() {
-		JinglePacket packet = bootstrapPacket("session-terminate");
-		Reason reason = new Reason();
-		reason.addChild("cancel");
-		packet.setReason(reason);
-		this.sendJinglePacket(packet);
-	}
-
-	private void connectNextCandidate() {
-		for (JingleCandidate candidate : this.candidates) {
-			if ((!connections.containsKey(candidate.getCid()) && (!candidate
-					.isOurs()))) {
-				this.connectWithCandidate(candidate);
-				return;
-			}
-		}
-		this.sendCandidateError();
-	}
-
-	private void connectWithCandidate(final JingleCandidate candidate) {
-		final JingleSocks5Transport socksConnection = new JingleSocks5Transport(
-				this, candidate);
-		connections.put(candidate.getCid(), socksConnection);
-		socksConnection.connect(new OnTransportConnected() {
-
-			@Override
-			public void failed() {
-				Log.d(Config.LOGTAG,
-						"connection failed with " + candidate.getHost() + ":"
-								+ candidate.getPort());
-				connectNextCandidate();
-			}
-
-			@Override
-			public void established() {
-				Log.d(Config.LOGTAG,
-						"established connection with " + candidate.getHost()
-								+ ":" + candidate.getPort());
-				sendCandidateUsed(candidate.getCid());
-			}
-		});
-	}
-
-	private void disconnectSocks5Connections() {
-		Iterator<Entry<String, JingleSocks5Transport>> it = this.connections
-				.entrySet().iterator();
-		while (it.hasNext()) {
-			Entry<String, JingleSocks5Transport> pairs = it.next();
-			pairs.getValue().disconnect();
-			it.remove();
-		}
-	}
-
-	private void sendProxyActivated(String cid) {
-		JinglePacket packet = bootstrapPacket("transport-info");
-		Content content = new Content(this.contentCreator, this.contentName);
-		content.setTransportId(this.transportId);
-		content.socks5transport().addChild("activated")
-				.setAttribute("cid", cid);
-		packet.setContent(content);
-		this.sendJinglePacket(packet);
-	}
-
-	private void sendCandidateUsed(final String cid) {
-		JinglePacket packet = bootstrapPacket("transport-info");
-		Content content = new Content(this.contentCreator, this.contentName);
-		content.setTransportId(this.transportId);
-		content.socks5transport().addChild("candidate-used")
-				.setAttribute("cid", cid);
-		packet.setContent(content);
-		this.sentCandidate = true;
-		if ((receivedCandidate) && (mJingleStatus == JINGLE_STATUS_ACCEPTED)) {
-			connect();
-		}
-		this.sendJinglePacket(packet);
-	}
-
-	private void sendCandidateError() {
-		JinglePacket packet = bootstrapPacket("transport-info");
-		Content content = new Content(this.contentCreator, this.contentName);
-		content.setTransportId(this.transportId);
-		content.socks5transport().addChild("candidate-error");
-		packet.setContent(content);
-		this.sentCandidate = true;
-		if ((receivedCandidate) && (mJingleStatus == JINGLE_STATUS_ACCEPTED)) {
-			connect();
-		}
-		this.sendJinglePacket(packet);
-	}
-
-	public Jid getInitiator() {
-		return this.initiator;
-	}
-
-	public Jid getResponder() {
-		return this.responder;
-	}
-
-	public int getJingleStatus() {
-		return this.mJingleStatus;
-	}
-
-	private boolean equalCandidateExists(JingleCandidate candidate) {
-		for (JingleCandidate c : this.candidates) {
-			if (c.equalValues(candidate)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private void mergeCandidate(JingleCandidate candidate) {
-		for (JingleCandidate c : this.candidates) {
-			if (c.equals(candidate)) {
-				return;
-			}
-		}
-		this.candidates.add(candidate);
-	}
-
-	private void mergeCandidates(List<JingleCandidate> candidates) {
-		for (JingleCandidate c : candidates) {
-			mergeCandidate(c);
-		}
-	}
-
-	private JingleCandidate getCandidate(String cid) {
-		for (JingleCandidate c : this.candidates) {
-			if (c.getCid().equals(cid)) {
-				return c;
-			}
-		}
-		return null;
-	}
-
-	public void updateProgress(int i) {
-		this.mProgress = i;
-		mXmppConnectionService.updateConversationUi();
-	}
-
-	public String getTransportId() {
-		return this.transportId;
-	}
-
-	public Content.Version getFtVersion() {
-		return this.ftVersion;
-	}
-
-	interface OnProxyActivated {
-		public void success();
-
-		public void failed();
-	}
-
-	public boolean hasTransportId(String sid) {
-		return sid.equals(this.transportId);
-	}
-
-	public JingleTransport getTransport() {
-		return this.transport;
-	}
-
-	public boolean start() {
-		if (account.getStatus() == Account.State.ONLINE) {
-			if (mJingleStatus == JINGLE_STATUS_INITIATED) {
-				new Thread(new Runnable() {
-
-					@Override
-					public void run() {
-						sendAccept();
-					}
-				}).start();
-			}
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	@Override
-	public int getStatus() {
-		return this.mStatus;
-	}
-
-	@Override
-	public long getFileSize() {
-		if (this.file != null) {
-			return this.file.getExpectedSize();
-		} else {
-			return 0;
-		}
-	}
-
-	@Override
-	public int getProgress() {
-		return this.mProgress;
-	}
-
-	public AbstractConnectionManager getConnectionManager() {
-		return this.mJingleConnectionManager;
-	}
+                this.message.setTransferable(null);
+            }
+        }
+        this.mJingleConnectionManager.finishConnection(this);
+    }
+
+    private void sendCancel() {
+        JinglePacket packet = bootstrapPacket("session-terminate");
+        Reason reason = new Reason();
+        reason.addChild("cancel");
+        packet.setReason(reason);
+        this.sendJinglePacket(packet);
+    }
+
+    private void connectNextCandidate() {
+        for (JingleCandidate candidate : this.candidates) {
+            if ((!connections.containsKey(candidate.getCid()) && (!candidate
+                    .isOurs()))) {
+                this.connectWithCandidate(candidate);
+                return;
+            }
+        }
+        this.sendCandidateError();
+    }
+
+    private void connectWithCandidate(final JingleCandidate candidate) {
+        final JingleSocks5Transport socksConnection = new JingleSocks5Transport(
+                this, candidate);
+        connections.put(candidate.getCid(), socksConnection);
+        socksConnection.connect(new OnTransportConnected() {
+
+            @Override
+            public void failed() {
+                Log.d(Config.LOGTAG,
+                        "connection failed with " + candidate.getHost() + ":"
+                                + candidate.getPort());
+                connectNextCandidate();
+            }
+
+            @Override
+            public void established() {
+                Log.d(Config.LOGTAG,
+                        "established connection with " + candidate.getHost()
+                                + ":" + candidate.getPort());
+                sendCandidateUsed(candidate.getCid());
+            }
+        });
+    }
+
+    private void disconnectSocks5Connections() {
+        Iterator<Entry<String, JingleSocks5Transport>> it = this.connections
+                .entrySet().iterator();
+        while (it.hasNext()) {
+            Entry<String, JingleSocks5Transport> pairs = it.next();
+            pairs.getValue().disconnect();
+            it.remove();
+        }
+    }
+
+    private void sendProxyActivated(String cid) {
+        JinglePacket packet = bootstrapPacket("transport-info");
+        Content content = new Content(this.contentCreator, this.contentName);
+        content.setTransportId(this.transportId);
+        content.socks5transport().addChild("activated")
+                .setAttribute("cid", cid);
+        packet.setContent(content);
+        this.sendJinglePacket(packet);
+    }
+
+    private void sendCandidateUsed(final String cid) {
+        JinglePacket packet = bootstrapPacket("transport-info");
+        Content content = new Content(this.contentCreator, this.contentName);
+        content.setTransportId(this.transportId);
+        content.socks5transport().addChild("candidate-used")
+                .setAttribute("cid", cid);
+        packet.setContent(content);
+        this.sentCandidate = true;
+        if ((receivedCandidate) && (mJingleStatus == JINGLE_STATUS_ACCEPTED)) {
+            connect();
+        }
+        this.sendJinglePacket(packet);
+    }
+
+    private void sendCandidateError() {
+        JinglePacket packet = bootstrapPacket("transport-info");
+        Content content = new Content(this.contentCreator, this.contentName);
+        content.setTransportId(this.transportId);
+        content.socks5transport().addChild("candidate-error");
+        packet.setContent(content);
+        this.sentCandidate = true;
+        if ((receivedCandidate) && (mJingleStatus == JINGLE_STATUS_ACCEPTED)) {
+            connect();
+        }
+        this.sendJinglePacket(packet);
+    }
+
+    public Jid getInitiator() {
+        return this.initiator;
+    }
+
+    public Jid getResponder() {
+        return this.responder;
+    }
+
+    public int getJingleStatus() {
+        return this.mJingleStatus;
+    }
+
+    private boolean equalCandidateExists(JingleCandidate candidate) {
+        for (JingleCandidate c : this.candidates) {
+            if (c.equalValues(candidate)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void mergeCandidate(JingleCandidate candidate) {
+        for (JingleCandidate c : this.candidates) {
+            if (c.equals(candidate)) {
+                return;
+            }
+        }
+        this.candidates.add(candidate);
+    }
+
+    private void mergeCandidates(List<JingleCandidate> candidates) {
+        for (JingleCandidate c : candidates) {
+            mergeCandidate(c);
+        }
+    }
+
+    private JingleCandidate getCandidate(String cid) {
+        for (JingleCandidate c : this.candidates) {
+            if (c.getCid().equals(cid)) {
+                return c;
+            }
+        }
+        return null;
+    }
+
+    public void updateProgress(int i) {
+        this.mProgress = i;
+        mXmppConnectionService.updateConversationUi();
+    }
+
+    public String getTransportId() {
+        return this.transportId;
+    }
+
+    public Content.Version getFtVersion() {
+        return this.ftVersion;
+    }
+
+    interface OnProxyActivated {
+        public void success();
+
+        public void failed();
+    }
+
+    public boolean hasTransportId(String sid) {
+        return sid.equals(this.transportId);
+    }
+
+    public JingleTransport getTransport() {
+        return this.transport;
+    }
+
+    public boolean start() {
+        if (account.getStatus() == Account.State.ONLINE) {
+            if (mJingleStatus == JINGLE_STATUS_INITIATED) {
+                new Thread(new Runnable() {
+
+                    @Override
+                    public void run() {
+                        sendAccept();
+                    }
+                }).start();
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int getStatus() {
+        return this.mStatus;
+    }
+
+    @Override
+    public long getFileSize() {
+        if (this.file != null) {
+            return this.file.getExpectedSize();
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public int getProgress() {
+        return this.mProgress;
+    }
+
+    public AbstractConnectionManager getConnectionManager() {
+        return this.mJingleConnectionManager;
+    }
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java
index b8f96bded..d36bc52b0 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java
@@ -23,149 +23,149 @@ import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket;
 import de.pixart.messenger.xmpp.stanzas.IqPacket;
 
 public class JingleConnectionManager extends AbstractConnectionManager {
-	private List<JingleConnection> connections = new CopyOnWriteArrayList<>();
-
-	private HashMap<Jid, JingleCandidate> primaryCandidates = new HashMap<>();
-
-	@SuppressLint("TrulyRandom")
-	private SecureRandom random = new SecureRandom();
-
-	public JingleConnectionManager(XmppConnectionService service) {
-		super(service);
-	}
-
-	public void deliverPacket(Account account, JinglePacket packet) {
-		if (packet.isAction("session-initiate")) {
-			JingleConnection connection = new JingleConnection(this);
-			connection.init(account, packet);
-			connections.add(connection);
-		} else {
-			for (JingleConnection connection : connections) {
-				if (connection.getAccount() == account
-						&& connection.getSessionId().equals(
-								packet.getSessionId())
-						&& connection.getCounterPart().equals(packet.getFrom())) {
-					connection.deliverPacket(packet);
-					return;
-				}
-			}
-			IqPacket response = packet.generateResponse(IqPacket.TYPE.ERROR);
-			Element error = response.addChild("error");
-			error.setAttribute("type", "cancel");
-			error.addChild("item-not-found",
-					"urn:ietf:params:xml:ns:xmpp-stanzas");
-			error.addChild("unknown-session", "urn:xmpp:jingle:errors:1");
-			account.getXmppConnection().sendIqPacket(response, null);
-		}
-	}
-
-	public JingleConnection createNewConnection(Message message) {
-		Transferable old = message.getTransferable();
-		if (old != null) {
-			old.cancel();
-		}
-		JingleConnection connection = new JingleConnection(this);
-		mXmppConnectionService.markMessage(message,Message.STATUS_WAITING);
-		connection.init(message);
-		this.connections.add(connection);
-		return connection;
-	}
-
-	public JingleConnection createNewConnection(final JinglePacket packet) {
-		JingleConnection connection = new JingleConnection(this);
-		this.connections.add(connection);
-		return connection;
-	}
-
-	public void finishConnection(JingleConnection connection) {
-		this.connections.remove(connection);
-	}
-
-	public void getPrimaryCandidate(Account account,
-			final OnPrimaryCandidateFound listener) {
-		if (Config.DISABLE_PROXY_LOOKUP) {
-			listener.onPrimaryCandidateFound(false, null);
-			return;
-		}
-		if (!this.primaryCandidates.containsKey(account.getJid().toBareJid())) {
-			final Jid proxy = account.getXmppConnection().findDiscoItemByFeature(Xmlns.BYTE_STREAMS);
-			if (proxy != null) {
-				IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
-				iq.setTo(proxy);
-				iq.query(Xmlns.BYTE_STREAMS);
-				account.getXmppConnection().sendIqPacket(iq,new OnIqPacketReceived() {
-
-					@Override
-					public void onIqPacketReceived(Account account, IqPacket packet) {
-						Element streamhost = packet.query().findChild("streamhost",Xmlns.BYTE_STREAMS);
-						final String host = streamhost == null ? null : streamhost.getAttribute("host");
-						final String port = streamhost == null ? null : streamhost.getAttribute("port");
-						if (host != null && port != null) {
-							try {
-								JingleCandidate candidate = new JingleCandidate(nextRandomId(), true);
-								candidate.setHost(host);
-								candidate.setPort(Integer.parseInt(port));
-								candidate.setType(JingleCandidate.TYPE_PROXY);
-								candidate.setJid(proxy);
-								candidate.setPriority(655360 + 65535);
-								primaryCandidates.put(account.getJid().toBareJid(),candidate);
-								listener.onPrimaryCandidateFound(true,candidate);
-							} catch (final NumberFormatException e) {
-								listener.onPrimaryCandidateFound(false,null);
-								return;
-							}
-						} else {
-							listener.onPrimaryCandidateFound(false,null);
-						}
-					}
-				});
-			} else {
-				listener.onPrimaryCandidateFound(false, null);
-			}
-
-		} else {
-			listener.onPrimaryCandidateFound(true,
-					this.primaryCandidates.get(account.getJid().toBareJid()));
-		}
-	}
-
-	public String nextRandomId() {
-		return new BigInteger(50, random).toString(32);
-	}
-
-	public void deliverIbbPacket(Account account, IqPacket packet) {
-		String sid = null;
-		Element payload = null;
-		if (packet.hasChild("open", "http://jabber.org/protocol/ibb")) {
-			payload = packet.findChild("open", "http://jabber.org/protocol/ibb");
-			sid = payload.getAttribute("sid");
-		} else if (packet.hasChild("data", "http://jabber.org/protocol/ibb")) {
-			payload = packet.findChild("data", "http://jabber.org/protocol/ibb");
-			sid = payload.getAttribute("sid");
-		}
-		if (sid != null) {
-			for (JingleConnection connection : connections) {
-				if (connection.getAccount() == account
-						&& connection.hasTransportId(sid)) {
-					JingleTransport transport = connection.getTransport();
-					if (transport instanceof JingleInbandTransport) {
-						JingleInbandTransport inbandTransport = (JingleInbandTransport) transport;
-						inbandTransport.deliverPayload(packet, payload);
-						return;
-					}
-				}
-			}
-			Log.d(Config.LOGTAG,"couldn't deliver payload: " + payload.toString());
-		} else {
-			Log.d(Config.LOGTAG, "no sid found in incoming ibb packet");
-		}
-	}
-
-	public void cancelInTransmission() {
-		for (JingleConnection connection : this.connections) {
-			if (connection.getJingleStatus() == JingleConnection.JINGLE_STATUS_TRANSMITTING) {
-				connection.cancel();
-			}
-		}
-	}
+    private List<JingleConnection> connections = new CopyOnWriteArrayList<>();
+
+    private HashMap<Jid, JingleCandidate> primaryCandidates = new HashMap<>();
+
+    @SuppressLint("TrulyRandom")
+    private SecureRandom random = new SecureRandom();
+
+    public JingleConnectionManager(XmppConnectionService service) {
+        super(service);
+    }
+
+    public void deliverPacket(Account account, JinglePacket packet) {
+        if (packet.isAction("session-initiate")) {
+            JingleConnection connection = new JingleConnection(this);
+            connection.init(account, packet);
+            connections.add(connection);
+        } else {
+            for (JingleConnection connection : connections) {
+                if (connection.getAccount() == account
+                        && connection.getSessionId().equals(
+                        packet.getSessionId())
+                        && connection.getCounterPart().equals(packet.getFrom())) {
+                    connection.deliverPacket(packet);
+                    return;
+                }
+            }
+            IqPacket response = packet.generateResponse(IqPacket.TYPE.ERROR);
+            Element error = response.addChild("error");
+            error.setAttribute("type", "cancel");
+            error.addChild("item-not-found",
+                    "urn:ietf:params:xml:ns:xmpp-stanzas");
+            error.addChild("unknown-session", "urn:xmpp:jingle:errors:1");
+            account.getXmppConnection().sendIqPacket(response, null);
+        }
+    }
+
+    public JingleConnection createNewConnection(Message message) {
+        Transferable old = message.getTransferable();
+        if (old != null) {
+            old.cancel();
+        }
+        JingleConnection connection = new JingleConnection(this);
+        mXmppConnectionService.markMessage(message, Message.STATUS_WAITING);
+        connection.init(message);
+        this.connections.add(connection);
+        return connection;
+    }
+
+    public JingleConnection createNewConnection(final JinglePacket packet) {
+        JingleConnection connection = new JingleConnection(this);
+        this.connections.add(connection);
+        return connection;
+    }
+
+    public void finishConnection(JingleConnection connection) {
+        this.connections.remove(connection);
+    }
+
+    public void getPrimaryCandidate(Account account,
+                                    final OnPrimaryCandidateFound listener) {
+        if (Config.DISABLE_PROXY_LOOKUP) {
+            listener.onPrimaryCandidateFound(false, null);
+            return;
+        }
+        if (!this.primaryCandidates.containsKey(account.getJid().toBareJid())) {
+            final Jid proxy = account.getXmppConnection().findDiscoItemByFeature(Xmlns.BYTE_STREAMS);
+            if (proxy != null) {
+                IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
+                iq.setTo(proxy);
+                iq.query(Xmlns.BYTE_STREAMS);
+                account.getXmppConnection().sendIqPacket(iq, new OnIqPacketReceived() {
+
+                    @Override
+                    public void onIqPacketReceived(Account account, IqPacket packet) {
+                        Element streamhost = packet.query().findChild("streamhost", Xmlns.BYTE_STREAMS);
+                        final String host = streamhost == null ? null : streamhost.getAttribute("host");
+                        final String port = streamhost == null ? null : streamhost.getAttribute("port");
+                        if (host != null && port != null) {
+                            try {
+                                JingleCandidate candidate = new JingleCandidate(nextRandomId(), true);
+                                candidate.setHost(host);
+                                candidate.setPort(Integer.parseInt(port));
+                                candidate.setType(JingleCandidate.TYPE_PROXY);
+                                candidate.setJid(proxy);
+                                candidate.setPriority(655360 + 65535);
+                                primaryCandidates.put(account.getJid().toBareJid(), candidate);
+                                listener.onPrimaryCandidateFound(true, candidate);
+                            } catch (final NumberFormatException e) {
+                                listener.onPrimaryCandidateFound(false, null);
+                                return;
+                            }
+                        } else {
+                            listener.onPrimaryCandidateFound(false, null);
+                        }
+                    }
+                });
+            } else {
+                listener.onPrimaryCandidateFound(false, null);
+            }
+
+        } else {
+            listener.onPrimaryCandidateFound(true,
+                    this.primaryCandidates.get(account.getJid().toBareJid()));
+        }
+    }
+
+    public String nextRandomId() {
+        return new BigInteger(50, random).toString(32);
+    }
+
+    public void deliverIbbPacket(Account account, IqPacket packet) {
+        String sid = null;
+        Element payload = null;
+        if (packet.hasChild("open", "http://jabber.org/protocol/ibb")) {
+            payload = packet.findChild("open", "http://jabber.org/protocol/ibb");
+            sid = payload.getAttribute("sid");
+        } else if (packet.hasChild("data", "http://jabber.org/protocol/ibb")) {
+            payload = packet.findChild("data", "http://jabber.org/protocol/ibb");
+            sid = payload.getAttribute("sid");
+        }
+        if (sid != null) {
+            for (JingleConnection connection : connections) {
+                if (connection.getAccount() == account
+                        && connection.hasTransportId(sid)) {
+                    JingleTransport transport = connection.getTransport();
+                    if (transport instanceof JingleInbandTransport) {
+                        JingleInbandTransport inbandTransport = (JingleInbandTransport) transport;
+                        inbandTransport.deliverPayload(packet, payload);
+                        return;
+                    }
+                }
+            }
+            Log.d(Config.LOGTAG, "couldn't deliver payload: " + payload.toString());
+        } else {
+            Log.d(Config.LOGTAG, "no sid found in incoming ibb packet");
+        }
+    }
+
+    public void cancelInTransmission() {
+        for (JingleConnection connection : this.connections) {
+            if (connection.getJingleStatus() == JingleConnection.JINGLE_STATUS_TRANSMITTING) {
+                connection.cancel();
+            }
+        }
+    }
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java
index 4e45c2a03..b19910c9f 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java
@@ -22,218 +22,218 @@ import de.pixart.messenger.xmpp.stanzas.IqPacket;
 
 public class JingleInbandTransport extends JingleTransport {
 
-	private Account account;
-	private Jid counterpart;
-	private int blockSize;
-	private int seq = 0;
-	private String sessionId;
-
-	private boolean established = false;
-
-	private boolean connected = true;
-
-	private DownloadableFile file;
-	private JingleConnection connection;
-
-	private InputStream fileInputStream = null;
-	private OutputStream fileOutputStream = null;
-	private long remainingSize = 0;
-	private long fileSize = 0;
-	private MessageDigest digest;
-
-	private OnFileTransmissionStatusChanged onFileTransmissionStatusChanged;
-
-	private OnIqPacketReceived onAckReceived = new OnIqPacketReceived() {
-		@Override
-		public void onIqPacketReceived(Account account, IqPacket packet) {
-			if (connected && packet.getType() == IqPacket.TYPE.RESULT) {
-				sendNextBlock();
-			}
-		}
-	};
-
-	public JingleInbandTransport(final JingleConnection connection, final String sid, final int blocksize) {
-		this.connection = connection;
-		this.account = connection.getAccount();
-		this.counterpart = connection.getCounterPart();
-		this.blockSize = blocksize;
-		this.sessionId = sid;
-	}
-
-	public void connect(final OnTransportConnected callback) {
-		IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
-		iq.setTo(this.counterpart);
-		Element open = iq.addChild("open", "http://jabber.org/protocol/ibb");
-		open.setAttribute("sid", this.sessionId);
-		open.setAttribute("stanza", "iq");
-		open.setAttribute("block-size", Integer.toString(this.blockSize));
-		this.connected = true;
-		this.account.getXmppConnection().sendIqPacket(iq,
-				new OnIqPacketReceived() {
-
-					@Override
-					public void onIqPacketReceived(Account account,
-							IqPacket packet) {
-						if (packet.getType() != IqPacket.TYPE.RESULT) {
-							callback.failed();
-						} else {
-							callback.established();
-						}
-					}
-				});
-	}
-
-	@Override
-	public void receive(DownloadableFile file,
-			OnFileTransmissionStatusChanged callback) {
-		this.onFileTransmissionStatusChanged = callback;
-		this.file = file;
-		try {
-			this.digest = MessageDigest.getInstance("SHA-1");
-			digest.reset();
-			file.getParentFile().mkdirs();
-			file.createNewFile();
-			this.fileOutputStream = connection.getFileOutputStream();
-			if (this.fileOutputStream == null) {
-				Log.d(Config.LOGTAG,account.getJid().toBareJid()+": could not create output stream");
-				callback.onFileTransferAborted();
-				return;
-			}
-			this.remainingSize = this.fileSize = file.getExpectedSize();
-		} catch (final NoSuchAlgorithmException | IOException e) {
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+" "+e.getMessage());
-			callback.onFileTransferAborted();
-		}
+    private Account account;
+    private Jid counterpart;
+    private int blockSize;
+    private int seq = 0;
+    private String sessionId;
+
+    private boolean established = false;
+
+    private boolean connected = true;
+
+    private DownloadableFile file;
+    private JingleConnection connection;
+
+    private InputStream fileInputStream = null;
+    private OutputStream fileOutputStream = null;
+    private long remainingSize = 0;
+    private long fileSize = 0;
+    private MessageDigest digest;
+
+    private OnFileTransmissionStatusChanged onFileTransmissionStatusChanged;
+
+    private OnIqPacketReceived onAckReceived = new OnIqPacketReceived() {
+        @Override
+        public void onIqPacketReceived(Account account, IqPacket packet) {
+            if (connected && packet.getType() == IqPacket.TYPE.RESULT) {
+                sendNextBlock();
+            }
+        }
+    };
+
+    public JingleInbandTransport(final JingleConnection connection, final String sid, final int blocksize) {
+        this.connection = connection;
+        this.account = connection.getAccount();
+        this.counterpart = connection.getCounterPart();
+        this.blockSize = blocksize;
+        this.sessionId = sid;
     }
 
-	@Override
-	public void send(DownloadableFile file,
-			OnFileTransmissionStatusChanged callback) {
-		this.onFileTransmissionStatusChanged = callback;
-		this.file = file;
-		try {
-			this.remainingSize = this.file.getExpectedSize();
-			this.fileSize = this.remainingSize;
-			this.digest = MessageDigest.getInstance("SHA-1");
-			this.digest.reset();
-			fileInputStream = connection.getFileInputStream();
-			if (fileInputStream == null) {
-				Log.d(Config.LOGTAG,account.getJid().toBareJid()+": could no create input stream");
-				callback.onFileTransferAborted();
-				return;
-			}
-			if (this.connected) {
-				this.sendNextBlock();
-			}
-		} catch (NoSuchAlgorithmException e) {
-			callback.onFileTransferAborted();
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": "+e.getMessage());
-		}
-	}
-
-	@Override
-	public void disconnect() {
-		this.connected = false;
-		if (this.fileOutputStream != null) {
-			try {
-				this.fileOutputStream.close();
-			} catch (IOException e) {
-
-			}
-		}
-		if (this.fileInputStream != null) {
-			try {
-				this.fileInputStream.close();
-			} catch (IOException e) {
-
-			}
-		}
-	}
-
-	private void sendNextBlock() {
-		byte[] buffer = new byte[this.blockSize];
-		try {
-			int count = fileInputStream.read(buffer);
-			if (count == -1) {
-				file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
-				this.onFileTransmissionStatusChanged.onFileTransmitted(file);
-				fileInputStream.close();
-				return;
-			} else if (count != buffer.length) {
-				int rem = fileInputStream.read(buffer,count,buffer.length-count);
-				if (rem > 0) {
-					count += rem;
-				}
-			}
-			this.remainingSize -= count;
-			this.digest.update(buffer,0,count);
-			String base64 = Base64.encodeToString(buffer,0,count, Base64.NO_WRAP);
-			IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
-			iq.setTo(this.counterpart);
-			Element data = iq.addChild("data", "http://jabber.org/protocol/ibb");
-			data.setAttribute("seq", Integer.toString(this.seq));
-			data.setAttribute("block-size", Integer.toString(this.blockSize));
-			data.setAttribute("sid", this.sessionId);
-			data.setContent(base64);
-			this.account.getXmppConnection().sendIqPacket(iq, this.onAckReceived);
-			this.account.getXmppConnection().r(); //don't fill up stanza queue too much
-			this.seq++;
-			if (this.remainingSize > 0) {
-				connection.updateProgress((int) ((((double) (this.fileSize - this.remainingSize)) / this.fileSize) * 100));
-			} else {
-				file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
-				this.onFileTransmissionStatusChanged.onFileTransmitted(file);
-				fileInputStream.close();
-			}
-		} catch (IOException e) {
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": "+e.getMessage());
-			FileBackend.close(fileInputStream);
-			this.onFileTransmissionStatusChanged.onFileTransferAborted();
-		}
-	}
-
-	private void receiveNextBlock(String data) {
-		try {
-			byte[] buffer = Base64.decode(data, Base64.NO_WRAP);
-			if (this.remainingSize < buffer.length) {
-				buffer = Arrays.copyOfRange(buffer, 0, (int) this.remainingSize);
-			}
-			this.remainingSize -= buffer.length;
-			this.fileOutputStream.write(buffer);
-			this.digest.update(buffer);
-			if (this.remainingSize <= 0) {
-				file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
-				fileOutputStream.flush();
-				fileOutputStream.close();
-				this.onFileTransmissionStatusChanged.onFileTransmitted(file);
-			} else {
-				connection.updateProgress((int) ((((double) (this.fileSize - this.remainingSize)) / this.fileSize) * 100));
-			}
-		} catch (Exception e) {
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": "+e.getMessage());
-			FileBackend.close(fileOutputStream);
-			this.onFileTransmissionStatusChanged.onFileTransferAborted();
-		}
-	}
-
-	public void deliverPayload(IqPacket packet, Element payload) {
-		if (payload.getName().equals("open")) {
-			if (!established) {
-				established = true;
-				connected = true;
-				this.receiveNextBlock("");
-				this.account.getXmppConnection().sendIqPacket(
-						packet.generateResponse(IqPacket.TYPE.RESULT), null);
-			} else {
-				this.account.getXmppConnection().sendIqPacket(
-						packet.generateResponse(IqPacket.TYPE.ERROR), null);
-			}
-		} else if (connected && payload.getName().equals("data")) {
-			this.receiveNextBlock(payload.getContent());
-			this.account.getXmppConnection().sendIqPacket(
-					packet.generateResponse(IqPacket.TYPE.RESULT), null);
-		} else {
-			// TODO some sort of exception
-		}
-	}
+    public void connect(final OnTransportConnected callback) {
+        IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
+        iq.setTo(this.counterpart);
+        Element open = iq.addChild("open", "http://jabber.org/protocol/ibb");
+        open.setAttribute("sid", this.sessionId);
+        open.setAttribute("stanza", "iq");
+        open.setAttribute("block-size", Integer.toString(this.blockSize));
+        this.connected = true;
+        this.account.getXmppConnection().sendIqPacket(iq,
+                new OnIqPacketReceived() {
+
+                    @Override
+                    public void onIqPacketReceived(Account account,
+                                                   IqPacket packet) {
+                        if (packet.getType() != IqPacket.TYPE.RESULT) {
+                            callback.failed();
+                        } else {
+                            callback.established();
+                        }
+                    }
+                });
+    }
+
+    @Override
+    public void receive(DownloadableFile file,
+                        OnFileTransmissionStatusChanged callback) {
+        this.onFileTransmissionStatusChanged = callback;
+        this.file = file;
+        try {
+            this.digest = MessageDigest.getInstance("SHA-1");
+            digest.reset();
+            file.getParentFile().mkdirs();
+            file.createNewFile();
+            this.fileOutputStream = connection.getFileOutputStream();
+            if (this.fileOutputStream == null) {
+                Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": could not create output stream");
+                callback.onFileTransferAborted();
+                return;
+            }
+            this.remainingSize = this.fileSize = file.getExpectedSize();
+        } catch (final NoSuchAlgorithmException | IOException e) {
+            Log.d(Config.LOGTAG, account.getJid().toBareJid() + " " + e.getMessage());
+            callback.onFileTransferAborted();
+        }
+    }
+
+    @Override
+    public void send(DownloadableFile file,
+                     OnFileTransmissionStatusChanged callback) {
+        this.onFileTransmissionStatusChanged = callback;
+        this.file = file;
+        try {
+            this.remainingSize = this.file.getExpectedSize();
+            this.fileSize = this.remainingSize;
+            this.digest = MessageDigest.getInstance("SHA-1");
+            this.digest.reset();
+            fileInputStream = connection.getFileInputStream();
+            if (fileInputStream == null) {
+                Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": could no create input stream");
+                callback.onFileTransferAborted();
+                return;
+            }
+            if (this.connected) {
+                this.sendNextBlock();
+            }
+        } catch (NoSuchAlgorithmException e) {
+            callback.onFileTransferAborted();
+            Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": " + e.getMessage());
+        }
+    }
+
+    @Override
+    public void disconnect() {
+        this.connected = false;
+        if (this.fileOutputStream != null) {
+            try {
+                this.fileOutputStream.close();
+            } catch (IOException e) {
+
+            }
+        }
+        if (this.fileInputStream != null) {
+            try {
+                this.fileInputStream.close();
+            } catch (IOException e) {
+
+            }
+        }
+    }
+
+    private void sendNextBlock() {
+        byte[] buffer = new byte[this.blockSize];
+        try {
+            int count = fileInputStream.read(buffer);
+            if (count == -1) {
+                file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
+                this.onFileTransmissionStatusChanged.onFileTransmitted(file);
+                fileInputStream.close();
+                return;
+            } else if (count != buffer.length) {
+                int rem = fileInputStream.read(buffer, count, buffer.length - count);
+                if (rem > 0) {
+                    count += rem;
+                }
+            }
+            this.remainingSize -= count;
+            this.digest.update(buffer, 0, count);
+            String base64 = Base64.encodeToString(buffer, 0, count, Base64.NO_WRAP);
+            IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
+            iq.setTo(this.counterpart);
+            Element data = iq.addChild("data", "http://jabber.org/protocol/ibb");
+            data.setAttribute("seq", Integer.toString(this.seq));
+            data.setAttribute("block-size", Integer.toString(this.blockSize));
+            data.setAttribute("sid", this.sessionId);
+            data.setContent(base64);
+            this.account.getXmppConnection().sendIqPacket(iq, this.onAckReceived);
+            this.account.getXmppConnection().r(); //don't fill up stanza queue too much
+            this.seq++;
+            if (this.remainingSize > 0) {
+                connection.updateProgress((int) ((((double) (this.fileSize - this.remainingSize)) / this.fileSize) * 100));
+            } else {
+                file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
+                this.onFileTransmissionStatusChanged.onFileTransmitted(file);
+                fileInputStream.close();
+            }
+        } catch (IOException e) {
+            Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": " + e.getMessage());
+            FileBackend.close(fileInputStream);
+            this.onFileTransmissionStatusChanged.onFileTransferAborted();
+        }
+    }
+
+    private void receiveNextBlock(String data) {
+        try {
+            byte[] buffer = Base64.decode(data, Base64.NO_WRAP);
+            if (this.remainingSize < buffer.length) {
+                buffer = Arrays.copyOfRange(buffer, 0, (int) this.remainingSize);
+            }
+            this.remainingSize -= buffer.length;
+            this.fileOutputStream.write(buffer);
+            this.digest.update(buffer);
+            if (this.remainingSize <= 0) {
+                file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
+                fileOutputStream.flush();
+                fileOutputStream.close();
+                this.onFileTransmissionStatusChanged.onFileTransmitted(file);
+            } else {
+                connection.updateProgress((int) ((((double) (this.fileSize - this.remainingSize)) / this.fileSize) * 100));
+            }
+        } catch (Exception e) {
+            Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": " + e.getMessage());
+            FileBackend.close(fileOutputStream);
+            this.onFileTransmissionStatusChanged.onFileTransferAborted();
+        }
+    }
+
+    public void deliverPayload(IqPacket packet, Element payload) {
+        if (payload.getName().equals("open")) {
+            if (!established) {
+                established = true;
+                connected = true;
+                this.receiveNextBlock("");
+                this.account.getXmppConnection().sendIqPacket(
+                        packet.generateResponse(IqPacket.TYPE.RESULT), null);
+            } else {
+                this.account.getXmppConnection().sendIqPacket(
+                        packet.generateResponse(IqPacket.TYPE.ERROR), null);
+            }
+        } else if (connected && payload.getName().equals("data")) {
+            this.receiveNextBlock(payload.getContent());
+            this.account.getXmppConnection().sendIqPacket(
+                    packet.generateResponse(IqPacket.TYPE.RESULT), null);
+        } else {
+            // TODO some sort of exception
+        }
+    }
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java
index 4f3e78394..57d1afeba 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java
@@ -20,191 +20,191 @@ import de.pixart.messenger.utils.SocksSocketFactory;
 import de.pixart.messenger.xmpp.jingle.stanzas.Content;
 
 public class JingleSocks5Transport extends JingleTransport {
-	private JingleCandidate candidate;
-	private JingleConnection connection;
-	private String destination;
-	private OutputStream outputStream;
-	private InputStream inputStream;
-	private boolean isEstablished = false;
-	private boolean activated = false;
-	protected Socket socket;
-
-	public JingleSocks5Transport(JingleConnection jingleConnection,
-			JingleCandidate candidate) {
-		this.candidate = candidate;
-		this.connection = jingleConnection;
-		try {
-			MessageDigest mDigest = MessageDigest.getInstance("SHA-1");
-			StringBuilder destBuilder = new StringBuilder();
-			if (jingleConnection.getFtVersion() == Content.Version.FT_3) {
-				Log.d(Config.LOGTAG,this.connection.getAccount().getJid().toBareJid()+": using session Id instead of transport Id for proxy destination");
-				destBuilder.append(jingleConnection.getSessionId());
-			} else {
-				destBuilder.append(jingleConnection.getTransportId());
-			}
-			if (candidate.isOurs()) {
-				destBuilder.append(jingleConnection.getAccount().getJid());
-				destBuilder.append(jingleConnection.getCounterPart());
-			} else {
-				destBuilder.append(jingleConnection.getCounterPart());
-				destBuilder.append(jingleConnection.getAccount().getJid());
-			}
-			mDigest.reset();
-			this.destination = CryptoHelper.bytesToHex(mDigest
-					.digest(destBuilder.toString().getBytes()));
-		} catch (NoSuchAlgorithmException e) {
-
-		}
-	}
-
-	public void connect(final OnTransportConnected callback) {
-		new Thread(new Runnable() {
-
-			@Override
-			public void run() {
-				try {
-					final boolean useTor = connection.getAccount().isOnion() || connection.getConnectionManager().getXmppConnectionService().useTorToConnect();
-					if (useTor) {
-						socket = SocksSocketFactory.createSocketOverTor(candidate.getHost(),candidate.getPort());
-					} else {
-						socket = new Socket();
-						SocketAddress address = new InetSocketAddress(candidate.getHost(),candidate.getPort());
-						socket.connect(address,Config.SOCKET_TIMEOUT * 1000);
-					}
-					inputStream = socket.getInputStream();
-					outputStream = socket.getOutputStream();
-					SocksSocketFactory.createSocksConnection(socket,destination,0);
-					isEstablished = true;
-					callback.established();
-				} catch (IOException e) {
-					callback.failed();
-				}
-			}
-		}).start();
-
-	}
-
-	public void send(final DownloadableFile file, final OnFileTransmissionStatusChanged callback) {
-		new Thread(new Runnable() {
-
-			@Override
-			public void run() {
-				InputStream fileInputStream = null;
-				final PowerManager.WakeLock wakeLock = connection.getConnectionManager().createWakeLock("jingle_send_"+connection.getSessionId());
-				try {
-					wakeLock.acquire();
-					MessageDigest digest = MessageDigest.getInstance("SHA-1");
-					digest.reset();
-					fileInputStream = connection.getFileInputStream();
-					if (fileInputStream == null) {
-						Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": could not create input stream");
-						callback.onFileTransferAborted();
-						return;
-					}
-					long size = file.getExpectedSize();
-					long transmitted = 0;
-					int count;
-					byte[] buffer = new byte[8192];
-					while ((count = fileInputStream.read(buffer)) > 0) {
-						outputStream.write(buffer, 0, count);
-						digest.update(buffer, 0, count);
-						transmitted += count;
-						connection.updateProgress((int) ((((double) transmitted) / size) * 100));
-					}
-					outputStream.flush();
-					file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
-					if (callback != null) {
-						callback.onFileTransmitted(file);
-					}
-				} catch (Exception e) {
-					Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
-					callback.onFileTransferAborted();
-				} finally {
-					FileBackend.close(fileInputStream);
-					wakeLock.release();
-				}
-			}
-		}).start();
-
-	}
-
-	public void receive(final DownloadableFile file, final OnFileTransmissionStatusChanged callback) {
-		new Thread(new Runnable() {
-
-			@Override
-			public void run() {
-				OutputStream fileOutputStream = null;
-				final PowerManager.WakeLock wakeLock = connection.getConnectionManager().createWakeLock("jingle_receive_"+connection.getSessionId());
-				try {
-					wakeLock.acquire();
-					MessageDigest digest = MessageDigest.getInstance("SHA-1");
-					digest.reset();
-					//inputStream.skip(45);
-					socket.setSoTimeout(30000);
-					file.getParentFile().mkdirs();
-					file.createNewFile();
-					fileOutputStream = connection.getFileOutputStream();
-					if (fileOutputStream == null) {
-						callback.onFileTransferAborted();
-						Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": could not create output stream");
-						return;
-					}
-					double size = file.getExpectedSize();
-					long remainingSize = file.getExpectedSize();
-					byte[] buffer = new byte[8192];
-					int count;
-					while (remainingSize > 0) {
-						count = inputStream.read(buffer);
-						if (count == -1) {
-							callback.onFileTransferAborted();
-							Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": file ended prematurely with "+remainingSize+" bytes remaining");
-							return;
-						} else {
-							fileOutputStream.write(buffer, 0, count);
-							digest.update(buffer, 0, count);
-							remainingSize -= count;
-						}
-						connection.updateProgress((int) (((size - remainingSize) / size) * 100));
-					}
-					fileOutputStream.flush();
-					fileOutputStream.close();
-					file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
-					callback.onFileTransmitted(file);
-				} catch (Exception e) {
-					Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": "+e.getMessage());
-					callback.onFileTransferAborted();
-				} finally {
-					wakeLock.release();
-					FileBackend.close(fileOutputStream);
-					FileBackend.close(inputStream);
-				}
-			}
-		}).start();
-	}
-
-	public boolean isProxy() {
-		return this.candidate.getType() == JingleCandidate.TYPE_PROXY;
-	}
-
-	public boolean needsActivation() {
-		return (this.isProxy() && !this.activated);
-	}
-
-	public void disconnect() {
-		FileBackend.close(inputStream);
-		FileBackend.close(outputStream);
-		FileBackend.close(socket);
-	}
-
-	public boolean isEstablished() {
-		return this.isEstablished;
-	}
-
-	public JingleCandidate getCandidate() {
-		return this.candidate;
-	}
-
-	public void setActivated(boolean activated) {
-		this.activated = activated;
-	}
+    private JingleCandidate candidate;
+    private JingleConnection connection;
+    private String destination;
+    private OutputStream outputStream;
+    private InputStream inputStream;
+    private boolean isEstablished = false;
+    private boolean activated = false;
+    protected Socket socket;
+
+    public JingleSocks5Transport(JingleConnection jingleConnection,
+                                 JingleCandidate candidate) {
+        this.candidate = candidate;
+        this.connection = jingleConnection;
+        try {
+            MessageDigest mDigest = MessageDigest.getInstance("SHA-1");
+            StringBuilder destBuilder = new StringBuilder();
+            if (jingleConnection.getFtVersion() == Content.Version.FT_3) {
+                Log.d(Config.LOGTAG, this.connection.getAccount().getJid().toBareJid() + ": using session Id instead of transport Id for proxy destination");
+                destBuilder.append(jingleConnection.getSessionId());
+            } else {
+                destBuilder.append(jingleConnection.getTransportId());
+            }
+            if (candidate.isOurs()) {
+                destBuilder.append(jingleConnection.getAccount().getJid());
+                destBuilder.append(jingleConnection.getCounterPart());
+            } else {
+                destBuilder.append(jingleConnection.getCounterPart());
+                destBuilder.append(jingleConnection.getAccount().getJid());
+            }
+            mDigest.reset();
+            this.destination = CryptoHelper.bytesToHex(mDigest
+                    .digest(destBuilder.toString().getBytes()));
+        } catch (NoSuchAlgorithmException e) {
+
+        }
+    }
+
+    public void connect(final OnTransportConnected callback) {
+        new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                try {
+                    final boolean useTor = connection.getAccount().isOnion() || connection.getConnectionManager().getXmppConnectionService().useTorToConnect();
+                    if (useTor) {
+                        socket = SocksSocketFactory.createSocketOverTor(candidate.getHost(), candidate.getPort());
+                    } else {
+                        socket = new Socket();
+                        SocketAddress address = new InetSocketAddress(candidate.getHost(), candidate.getPort());
+                        socket.connect(address, Config.SOCKET_TIMEOUT * 1000);
+                    }
+                    inputStream = socket.getInputStream();
+                    outputStream = socket.getOutputStream();
+                    SocksSocketFactory.createSocksConnection(socket, destination, 0);
+                    isEstablished = true;
+                    callback.established();
+                } catch (IOException e) {
+                    callback.failed();
+                }
+            }
+        }).start();
+
+    }
+
+    public void send(final DownloadableFile file, final OnFileTransmissionStatusChanged callback) {
+        new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                InputStream fileInputStream = null;
+                final PowerManager.WakeLock wakeLock = connection.getConnectionManager().createWakeLock("jingle_send_" + connection.getSessionId());
+                try {
+                    wakeLock.acquire();
+                    MessageDigest digest = MessageDigest.getInstance("SHA-1");
+                    digest.reset();
+                    fileInputStream = connection.getFileInputStream();
+                    if (fileInputStream == null) {
+                        Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": could not create input stream");
+                        callback.onFileTransferAborted();
+                        return;
+                    }
+                    long size = file.getExpectedSize();
+                    long transmitted = 0;
+                    int count;
+                    byte[] buffer = new byte[8192];
+                    while ((count = fileInputStream.read(buffer)) > 0) {
+                        outputStream.write(buffer, 0, count);
+                        digest.update(buffer, 0, count);
+                        transmitted += count;
+                        connection.updateProgress((int) ((((double) transmitted) / size) * 100));
+                    }
+                    outputStream.flush();
+                    file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
+                    if (callback != null) {
+                        callback.onFileTransmitted(file);
+                    }
+                } catch (Exception e) {
+                    Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": " + e.getMessage());
+                    callback.onFileTransferAborted();
+                } finally {
+                    FileBackend.close(fileInputStream);
+                    wakeLock.release();
+                }
+            }
+        }).start();
+
+    }
+
+    public void receive(final DownloadableFile file, final OnFileTransmissionStatusChanged callback) {
+        new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                OutputStream fileOutputStream = null;
+                final PowerManager.WakeLock wakeLock = connection.getConnectionManager().createWakeLock("jingle_receive_" + connection.getSessionId());
+                try {
+                    wakeLock.acquire();
+                    MessageDigest digest = MessageDigest.getInstance("SHA-1");
+                    digest.reset();
+                    //inputStream.skip(45);
+                    socket.setSoTimeout(30000);
+                    file.getParentFile().mkdirs();
+                    file.createNewFile();
+                    fileOutputStream = connection.getFileOutputStream();
+                    if (fileOutputStream == null) {
+                        callback.onFileTransferAborted();
+                        Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": could not create output stream");
+                        return;
+                    }
+                    double size = file.getExpectedSize();
+                    long remainingSize = file.getExpectedSize();
+                    byte[] buffer = new byte[8192];
+                    int count;
+                    while (remainingSize > 0) {
+                        count = inputStream.read(buffer);
+                        if (count == -1) {
+                            callback.onFileTransferAborted();
+                            Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": file ended prematurely with " + remainingSize + " bytes remaining");
+                            return;
+                        } else {
+                            fileOutputStream.write(buffer, 0, count);
+                            digest.update(buffer, 0, count);
+                            remainingSize -= count;
+                        }
+                        connection.updateProgress((int) (((size - remainingSize) / size) * 100));
+                    }
+                    fileOutputStream.flush();
+                    fileOutputStream.close();
+                    file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
+                    callback.onFileTransmitted(file);
+                } catch (Exception e) {
+                    Log.d(Config.LOGTAG, connection.getAccount().getJid().toBareJid() + ": " + e.getMessage());
+                    callback.onFileTransferAborted();
+                } finally {
+                    wakeLock.release();
+                    FileBackend.close(fileOutputStream);
+                    FileBackend.close(inputStream);
+                }
+            }
+        }).start();
+    }
+
+    public boolean isProxy() {
+        return this.candidate.getType() == JingleCandidate.TYPE_PROXY;
+    }
+
+    public boolean needsActivation() {
+        return (this.isProxy() && !this.activated);
+    }
+
+    public void disconnect() {
+        FileBackend.close(inputStream);
+        FileBackend.close(outputStream);
+        FileBackend.close(socket);
+    }
+
+    public boolean isEstablished() {
+        return this.isEstablished;
+    }
+
+    public JingleCandidate getCandidate() {
+        return this.candidate;
+    }
+
+    public void setActivated(boolean activated) {
+        this.activated = activated;
+    }
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java
index 1ee97b415..b9adb4632 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java
@@ -3,13 +3,13 @@ package de.pixart.messenger.xmpp.jingle;
 import de.pixart.messenger.entities.DownloadableFile;
 
 public abstract class JingleTransport {
-	public abstract void connect(final OnTransportConnected callback);
+    public abstract void connect(final OnTransportConnected callback);
 
-	public abstract void receive(final DownloadableFile file,
-			final OnFileTransmissionStatusChanged callback);
+    public abstract void receive(final DownloadableFile file,
+                                 final OnFileTransmissionStatusChanged callback);
 
-	public abstract void send(final DownloadableFile file,
-			final OnFileTransmissionStatusChanged callback);
+    public abstract void send(final DownloadableFile file,
+                              final OnFileTransmissionStatusChanged callback);
 
-	public abstract void disconnect();
+    public abstract void disconnect();
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java
index 6bbf7111a..65f9726d8 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java
@@ -3,7 +3,7 @@ package de.pixart.messenger.xmpp.jingle;
 import de.pixart.messenger.entities.DownloadableFile;
 
 public interface OnFileTransmissionStatusChanged {
-	void onFileTransmitted(DownloadableFile file);
+    void onFileTransmitted(DownloadableFile file);
 
-	void onFileTransferAborted();
+    void onFileTransferAborted();
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java
index 82dfefa5e..4cacac74c 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java
@@ -5,5 +5,5 @@ import de.pixart.messenger.xmpp.PacketReceived;
 import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket;
 
 public interface OnJinglePacketReceived extends PacketReceived {
-	void onJinglePacketReceived(Account account, JinglePacket packet);
+    void onJinglePacketReceived(Account account, JinglePacket packet);
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java
index fad7bb4d4..b1fb0b02a 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java
@@ -1,5 +1,5 @@
 package de.pixart.messenger.xmpp.jingle;
 
 public interface OnPrimaryCandidateFound {
-	void onPrimaryCandidateFound(boolean success, JingleCandidate canditate);
+    void onPrimaryCandidateFound(boolean success, JingleCandidate canditate);
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java
index 10efd76d7..11a3eed5e 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java
@@ -1,7 +1,7 @@
 package de.pixart.messenger.xmpp.jingle;
 
 public interface OnTransportConnected {
-	public void failed();
+    public void failed();
 
-	public void established();
+    public void established();
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java
index bef32926f..fc7231e30 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java
@@ -5,125 +5,125 @@ import de.pixart.messenger.xml.Element;
 
 public class Content extends Element {
 
-	public enum Version {
-		FT_3("urn:xmpp:jingle:apps:file-transfer:3"),
-		FT_4("urn:xmpp:jingle:apps:file-transfer:4");
-
-		private final String namespace;
-
-		Version(String namespace) {
-			this.namespace = namespace;
-		}
-
-		public String getNamespace() {
-			return namespace;
-		}
-	}
-
-	private String transportId;
-
-	public Content() {
-		super("content");
-	}
-
-	public Content(String creator, String name) {
-		super("content");
-		this.setAttribute("creator", creator);
-		this.setAttribute("name", name);
-	}
-
-	public Version getVersion() {
-		if (hasChild("description", Version.FT_3.namespace)) {
-			return Version.FT_3;
-		} else if (hasChild("description" , Version.FT_4.namespace)) {
-			return Version.FT_4;
-		}
-		return null;
-	}
-
-	public void setTransportId(String sid) {
-		this.transportId = sid;
-	}
-
-	public Element setFileOffer(DownloadableFile actualFile, boolean otr, Version version) {
-		Element description = this.addChild("description", version.namespace);
-		Element file;
-		if (version == Version.FT_3) {
-			Element offer = description.addChild("offer");
-			file = offer.addChild("file");
-		} else {
-			file = description.addChild("file");
-		}
-		file.addChild("size").setContent(Long.toString(actualFile.getExpectedSize()));
-		if (otr) {
-			file.addChild("name").setContent(actualFile.getName() + ".otr");
-		} else {
-			file.addChild("name").setContent(actualFile.getName());
-		}
-		return file;
-	}
-
-	public Element getFileOffer(Version version) {
-		Element description = this.findChild("description", version.namespace);
-		if (description == null) {
-			return null;
-		}
-		if (version == Version.FT_3) {
-			Element offer = description.findChild("offer");
-			if (offer == null) {
-				return null;
-			}
-			return offer.findChild("file");
-		} else {
-			return description.findChild("file");
-		}
-	}
-
-	public void setFileOffer(Element fileOffer, Version version) {
-		Element description = this.addChild("description", version.namespace);
-		if (version == Version.FT_3) {
-			description.addChild("offer").addChild(fileOffer);
-		} else {
-			description.addChild(fileOffer);
-		}
-	}
-
-	public String getTransportId() {
-		if (hasSocks5Transport()) {
-			this.transportId = socks5transport().getAttribute("sid");
-		} else if (hasIbbTransport()) {
-			this.transportId = ibbTransport().getAttribute("sid");
-		}
-		return this.transportId;
-	}
-
-	public Element socks5transport() {
-		Element transport = this.findChild("transport",
-				"urn:xmpp:jingle:transports:s5b:1");
-		if (transport == null) {
-			transport = this.addChild("transport",
-					"urn:xmpp:jingle:transports:s5b:1");
-			transport.setAttribute("sid", this.transportId);
-		}
-		return transport;
-	}
-
-	public Element ibbTransport() {
-		Element transport = this.findChild("transport",
-				"urn:xmpp:jingle:transports:ibb:1");
-		if (transport == null) {
-			transport = this.addChild("transport",
-					"urn:xmpp:jingle:transports:ibb:1");
-			transport.setAttribute("sid", this.transportId);
-		}
-		return transport;
-	}
-
-	public boolean hasSocks5Transport() {
-		return this.hasChild("transport", "urn:xmpp:jingle:transports:s5b:1");
-	}
-
-	public boolean hasIbbTransport() {
-		return this.hasChild("transport", "urn:xmpp:jingle:transports:ibb:1");
-	}
+    public enum Version {
+        FT_3("urn:xmpp:jingle:apps:file-transfer:3"),
+        FT_4("urn:xmpp:jingle:apps:file-transfer:4");
+
+        private final String namespace;
+
+        Version(String namespace) {
+            this.namespace = namespace;
+        }
+
+        public String getNamespace() {
+            return namespace;
+        }
+    }
+
+    private String transportId;
+
+    public Content() {
+        super("content");
+    }
+
+    public Content(String creator, String name) {
+        super("content");
+        this.setAttribute("creator", creator);
+        this.setAttribute("name", name);
+    }
+
+    public Version getVersion() {
+        if (hasChild("description", Version.FT_3.namespace)) {
+            return Version.FT_3;
+        } else if (hasChild("description", Version.FT_4.namespace)) {
+            return Version.FT_4;
+        }
+        return null;
+    }
+
+    public void setTransportId(String sid) {
+        this.transportId = sid;
+    }
+
+    public Element setFileOffer(DownloadableFile actualFile, boolean otr, Version version) {
+        Element description = this.addChild("description", version.namespace);
+        Element file;
+        if (version == Version.FT_3) {
+            Element offer = description.addChild("offer");
+            file = offer.addChild("file");
+        } else {
+            file = description.addChild("file");
+        }
+        file.addChild("size").setContent(Long.toString(actualFile.getExpectedSize()));
+        if (otr) {
+            file.addChild("name").setContent(actualFile.getName() + ".otr");
+        } else {
+            file.addChild("name").setContent(actualFile.getName());
+        }
+        return file;
+    }
+
+    public Element getFileOffer(Version version) {
+        Element description = this.findChild("description", version.namespace);
+        if (description == null) {
+            return null;
+        }
+        if (version == Version.FT_3) {
+            Element offer = description.findChild("offer");
+            if (offer == null) {
+                return null;
+            }
+            return offer.findChild("file");
+        } else {
+            return description.findChild("file");
+        }
+    }
+
+    public void setFileOffer(Element fileOffer, Version version) {
+        Element description = this.addChild("description", version.namespace);
+        if (version == Version.FT_3) {
+            description.addChild("offer").addChild(fileOffer);
+        } else {
+            description.addChild(fileOffer);
+        }
+    }
+
+    public String getTransportId() {
+        if (hasSocks5Transport()) {
+            this.transportId = socks5transport().getAttribute("sid");
+        } else if (hasIbbTransport()) {
+            this.transportId = ibbTransport().getAttribute("sid");
+        }
+        return this.transportId;
+    }
+
+    public Element socks5transport() {
+        Element transport = this.findChild("transport",
+                "urn:xmpp:jingle:transports:s5b:1");
+        if (transport == null) {
+            transport = this.addChild("transport",
+                    "urn:xmpp:jingle:transports:s5b:1");
+            transport.setAttribute("sid", this.transportId);
+        }
+        return transport;
+    }
+
+    public Element ibbTransport() {
+        Element transport = this.findChild("transport",
+                "urn:xmpp:jingle:transports:ibb:1");
+        if (transport == null) {
+            transport = this.addChild("transport",
+                    "urn:xmpp:jingle:transports:ibb:1");
+            transport.setAttribute("sid", this.transportId);
+        }
+        return transport;
+    }
+
+    public boolean hasSocks5Transport() {
+        return this.hasChild("transport", "urn:xmpp:jingle:transports:s5b:1");
+    }
+
+    public boolean hasIbbTransport() {
+        return this.hasChild("transport", "urn:xmpp:jingle:transports:ibb:1");
+    }
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java
index 971ab8e1b..de856772a 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java
@@ -5,92 +5,92 @@ import de.pixart.messenger.xmpp.jid.Jid;
 import de.pixart.messenger.xmpp.stanzas.IqPacket;
 
 public class JinglePacket extends IqPacket {
-	Content content = null;
-	Reason reason = null;
-	Element jingle = new Element("jingle");
+    Content content = null;
+    Reason reason = null;
+    Element jingle = new Element("jingle");
 
-	@Override
-	public Element addChild(Element child) {
-		if ("jingle".equals(child.getName())) {
-			Element contentElement = child.findChild("content");
-			if (contentElement != null) {
-				this.content = new Content();
-				this.content.setChildren(contentElement.getChildren());
-				this.content.setAttributes(contentElement.getAttributes());
-			}
-			Element reasonElement = child.findChild("reason");
-			if (reasonElement != null) {
-				this.reason = new Reason();
-				this.reason.setChildren(reasonElement.getChildren());
-				this.reason.setAttributes(reasonElement.getAttributes());
-			}
-			this.jingle.setAttributes(child.getAttributes());
-		}
-		return child;
-	}
+    @Override
+    public Element addChild(Element child) {
+        if ("jingle".equals(child.getName())) {
+            Element contentElement = child.findChild("content");
+            if (contentElement != null) {
+                this.content = new Content();
+                this.content.setChildren(contentElement.getChildren());
+                this.content.setAttributes(contentElement.getAttributes());
+            }
+            Element reasonElement = child.findChild("reason");
+            if (reasonElement != null) {
+                this.reason = new Reason();
+                this.reason.setChildren(reasonElement.getChildren());
+                this.reason.setAttributes(reasonElement.getAttributes());
+            }
+            this.jingle.setAttributes(child.getAttributes());
+        }
+        return child;
+    }
 
-	public JinglePacket setContent(Content content) {
-		this.content = content;
-		return this;
-	}
+    public JinglePacket setContent(Content content) {
+        this.content = content;
+        return this;
+    }
 
-	public Content getJingleContent() {
-		if (this.content == null) {
-			this.content = new Content();
-		}
-		return this.content;
-	}
+    public Content getJingleContent() {
+        if (this.content == null) {
+            this.content = new Content();
+        }
+        return this.content;
+    }
 
-	public JinglePacket setReason(Reason reason) {
-		this.reason = reason;
-		return this;
-	}
+    public JinglePacket setReason(Reason reason) {
+        this.reason = reason;
+        return this;
+    }
 
-	public Reason getReason() {
-		return this.reason;
-	}
+    public Reason getReason() {
+        return this.reason;
+    }
 
-	private void build() {
-		this.children.clear();
-		this.jingle.clearChildren();
-		this.jingle.setAttribute("xmlns", "urn:xmpp:jingle:1");
-		if (this.content != null) {
-			jingle.addChild(this.content);
-		}
-		if (this.reason != null) {
-			jingle.addChild(this.reason);
-		}
-		this.children.add(jingle);
-		this.setAttribute("type", "set");
-	}
+    private void build() {
+        this.children.clear();
+        this.jingle.clearChildren();
+        this.jingle.setAttribute("xmlns", "urn:xmpp:jingle:1");
+        if (this.content != null) {
+            jingle.addChild(this.content);
+        }
+        if (this.reason != null) {
+            jingle.addChild(this.reason);
+        }
+        this.children.add(jingle);
+        this.setAttribute("type", "set");
+    }
 
-	public String getSessionId() {
-		return this.jingle.getAttribute("sid");
-	}
+    public String getSessionId() {
+        return this.jingle.getAttribute("sid");
+    }
 
-	public void setSessionId(String sid) {
-		this.jingle.setAttribute("sid", sid);
-	}
+    public void setSessionId(String sid) {
+        this.jingle.setAttribute("sid", sid);
+    }
 
-	@Override
-	public String toString() {
-		this.build();
-		return super.toString();
-	}
+    @Override
+    public String toString() {
+        this.build();
+        return super.toString();
+    }
 
-	public void setAction(String action) {
-		this.jingle.setAttribute("action", action);
-	}
+    public void setAction(String action) {
+        this.jingle.setAttribute("action", action);
+    }
 
-	public String getAction() {
-		return this.jingle.getAttribute("action");
-	}
+    public String getAction() {
+        return this.jingle.getAttribute("action");
+    }
 
-	public void setInitiator(final Jid initiator) {
-		this.jingle.setAttribute("initiator", initiator.toString());
-	}
+    public void setInitiator(final Jid initiator) {
+        this.jingle.setAttribute("initiator", initiator.toString());
+    }
 
-	public boolean isAction(String action) {
-		return action.equalsIgnoreCase(this.getAction());
-	}
+    public boolean isAction(String action) {
+        return action.equalsIgnoreCase(this.getAction());
+    }
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java
index 3c77a91a6..19f27bc40 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java
@@ -3,11 +3,11 @@ package de.pixart.messenger.xmpp.jingle.stanzas;
 import de.pixart.messenger.xml.Element;
 
 public class Reason extends Element {
-	private Reason(String name) {
-		super(name);
-	}
+    private Reason(String name) {
+        super(name);
+    }
 
-	public Reason() {
-		super("reason");
-	}
+    public Reason() {
+        super("reason");
+    }
 }