diff options
| author | lookshe <github@lookshe.org> | 2016-03-25 20:04:37 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-25 20:04:37 +0100 |
| commit | 27c16b4b9acaad33b36145d63f6bfd7e04a3b3f1 (patch) | |
| tree | 20740102fb6502dd6b130f51054a681275f44431 /src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | |
| parent | 86d16b030b46aca24e6fab38e5d34beb503a6dc7 (diff) | |
| parent | 46be514b4db1cb8c17037ac6cd307078e4794a12 (diff) | |
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 9d167edd..acdf5652 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -222,12 +222,16 @@ public class XmppConnection implements Runnable { } } + public void prepareNewConnection() { + this.lastConnect = SystemClock.elapsedRealtime(); + this.lastPingSent = SystemClock.elapsedRealtime(); + this.lastDiscoStarted = Long.MAX_VALUE; + this.changeStatus(Account.State.CONNECTING); + } + protected void connect() { Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": connecting"); features.encryptionEnabled = false; - lastConnect = SystemClock.elapsedRealtime(); - lastPingSent = SystemClock.elapsedRealtime(); - lastDiscoStarted = Long.MAX_VALUE; this.attempt++; switch (account.getJid().getDomainpart()) { case "chat.facebook.com": |