diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-15 14:14:33 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-15 14:14:33 +0200 |
| commit | 32826ec29d28668b7f345ffcd45cd876dc980153 (patch) | |
| tree | d2e0ce958afb3e1b28aaae1a607c199faa575551 | |
| parent | 75bafd573e47440911329dee1d3a12482dc1a76a (diff) | |
provide extra interface to close sockets. fixes #1330
| -rw-r--r-- | src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 10 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java index 931158e5..6e5a1ae3 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java @@ -22,6 +22,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.net.Socket; import java.net.URL; import java.security.DigestOutputStream; import java.security.MessageDigest; @@ -557,4 +558,13 @@ public class FileBackend { } } } + + public static void close(Socket socket) { + if (socket != null) { + try { + socket.close(); + } catch (IOException e) { + } + } + } } diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index ed3bb879..a9a2f211 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -280,9 +280,8 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa scheduleWakeUpCall(Config.PING_MAX_INTERVAL, account.getUuid().hashCode()); } else if (account.getStatus() == Account.State.OFFLINE) { - resetSendingToWaiting(account); if (!account.isOptionSet(Account.OPTION_DISABLED)) { - int timeToReconnect = mRandom.nextInt(50) + 10; + int timeToReconnect = mRandom.nextInt(20) + 10; scheduleWakeUpCall(timeToReconnect,account.getUuid().hashCode()); } } else if (account.getStatus() == Account.State.REGISTRATION_SUCCESSFUL) { |