Stop thrashing reconnects while waiting for DB load

Stephen Paul Weber created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 1 
1 file changed, 1 insertion(+)

Detailed changes

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@@ -1242,6 +1242,7 @@ public class XmppConnectionService extends Service {
                 long secondsSinceLastDisco = (SystemClock.elapsedRealtime() - account.getXmppConnection().getLastDiscoStarted()) / 1000;
                 long discoTimeout = Config.CONNECT_DISCO_TIMEOUT - secondsSinceLastDisco;
                 long timeout = Config.CONNECT_TIMEOUT - secondsSinceLastConnect;
+                if (!areMessagesInitialized()) return false; // No point in thrashing a reconnect while still loading
                 if (timeout < 0) {
                     Log.d(Config.LOGTAG, account.getJid() + ": time out during connect reconnecting (secondsSinceLast=" + secondsSinceLastConnect + ")");
                     account.getXmppConnection().resetAttemptCount(false);