2 files changed, 9 insertions, 7 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 96b98fbb3..f59fc1591 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -664,7 +664,7 @@ public class XmppConnectionService extends Service {
             switch (action) {
                 case ConnectivityManager.CONNECTIVITY_ACTION:
                     if (hasInternetConnection() && Config.RESET_ATTEMPT_COUNT_ON_NETWORK_CHANGE) {
-                        resetAllAttemptCounts(true);
+                        resetAllAttemptCounts(true, false);
                     }
                     break;
                 case ACTION_MERGE_PHONE_CONTACTS:
@@ -686,7 +686,7 @@ public class XmppConnectionService extends Service {
                     dismissErrorNotifications();
                     break;
                 case ACTION_TRY_AGAIN:
-                    resetAllAttemptCounts(false);
+                    resetAllAttemptCounts(false, true);
                     interactive = true;
                     break;
                 case ACTION_REPLY_TO_CONVERSATION:
@@ -785,7 +785,7 @@ public class XmppConnectionService extends Service {
                         long timeout = Config.CONNECT_TIMEOUT - secondsSinceLastConnect;
                         if (timeout < 0) {
                             Log.d(Config.LOGTAG, account.getJid() + ": time out during connect reconnecting");
-                            account.getXmppConnection().resetAttemptCount();
+                            account.getXmppConnection().resetAttemptCount(false);
                             reconnectAccount(account, true, interactive);
                         } else if (discoTimeout < 0) {
                             account.getXmppConnection().sendDiscoTimeout();
@@ -931,13 +931,13 @@ public class XmppConnectionService extends Service {
         }
     }
 
-    private void resetAllAttemptCounts(boolean reallyAll) {
+    private void resetAllAttemptCounts(boolean reallyAll, boolean retryImmediately) {
         Log.d(Config.LOGTAG, "resetting all attempt counts");
         for (Account account : accounts) {
             if (account.hasErrorStatus() || reallyAll) {
                 final XmppConnection connection = account.getXmppConnection();
                 if (connection != null) {
-                    connection.resetAttemptCount();
+                    connection.resetAttemptCount(retryImmediately);
                 }
             }
             if (account.setShowErrorNotification(true)) {
diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
index bcb5904a7..657c9b71a 100644
--- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
@@ -1546,9 +1546,11 @@ public class XmppConnection implements Runnable {
         this.sendPacket(new InactivePacket());
     }
 
-    public void resetAttemptCount() {
+    public void resetAttemptCount(boolean resetConnectTime) {
         this.attempt = 0;
-        this.lastConnect = 0;
+        if (resetConnectTime) {
+            this.lastConnect = 0;
+        }
     }
 
     public void setInteractive(boolean interactive) {