implemented support for for jingle encrypted transports (XEP-0396)

1 files changed, 7 insertions, 2 deletions

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 027395a5a..2bbf7c981 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java
@@ -16,6 +16,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
 import de.pixart.messenger.Config;
+import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.DownloadableFile;
 import de.pixart.messenger.persistance.FileBackend;
 import de.pixart.messenger.services.AbstractConnectionManager;
@@ -135,11 +136,14 @@ public class JingleSocks5Transport extends JingleTransport {
             outputStream.write(response.array());
             outputStream.flush();
             if (success) {
+                Log.d(Config.LOGTAG, connection.getAccount().getJid().asBareJid() + ": successfully processed connection to candidate " + candidate.getHost() + ":" + candidate.getPort());
                 this.socket = socket;
                 this.inputStream = inputStream;
                 this.outputStream = outputStream;
                 this.isEstablished = true;
                 FileBackend.close(serverSocket);
+            } else {
+                this.socket.close();
             }
         } else {
             socket.close();
@@ -175,6 +179,7 @@ public class JingleSocks5Transport extends JingleTransport {
         new Thread(() -> {
             InputStream fileInputStream = null;
             final PowerManager.WakeLock wakeLock = connection.getConnectionManager().createWakeLock("jingle_send_" + connection.getSessionId());
+            long transmitted = 0;
             try {
                 wakeLock.acquire();
                 MessageDigest digest = MessageDigest.getInstance("SHA-1");
@@ -187,7 +192,6 @@ public class JingleSocks5Transport extends JingleTransport {
                 }
                 final InputStream innerInputStream = AbstractConnectionManager.upgrade(file, fileInputStream);
                 long size = file.getExpectedSize();
-                long transmitted = 0;
                 int count;
                 byte[] buffer = new byte[8192];
                 while ((count = innerInputStream.read(buffer)) > 0) {
@@ -202,7 +206,8 @@ public class JingleSocks5Transport extends JingleTransport {
                     callback.onFileTransmitted(file);
                 }
             } catch (Exception e) {
-                Log.d(Config.LOGTAG, connection.getAccount().getJid().asBareJid() + ": " + e.getMessage());
+                final Account account = connection.getAccount();
+                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": failed sending file after " + transmitted + "/" + file.getExpectedSize() + " (" + socket.getInetAddress() + ":" + socket.getPort() + ")", e);
                 callback.onFileTransferAborted();
             } finally {
                 FileBackend.close(fileInputStream);