1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index c4d5bfdf1..b42be17b9 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -1040,7 +1040,7 @@ public class XmppConnection implements Runnable {
 		final String ver = caps == null ? null : caps.getAttribute("ver");
 		ServiceDiscoveryResult discoveryResult = null;
 		if (hash != null && ver != null) {
-			discoveryResult = mXmppConnectionService.databaseBackend.findDiscoveryResult(hash, ver);
+			discoveryResult = mXmppConnectionService.getCachedServiceDiscoveryResult(new Pair<>(hash, ver));
 		}
 		if (discoveryResult == null) {
 			sendServiceDiscoveryInfo(account.getServer());
@@ -1435,7 +1435,7 @@ public class XmppConnection implements Runnable {
 	}
 
 	public int getTimeToNextAttempt() {
-		final int interval = (int) (25 * Math.pow(1.5, attempt));
+		final int interval = Math.min((int) (25 * Math.pow(1.3, attempt)), 300);
 		final int secondsSinceLast = (int) ((SystemClock.elapsedRealtime() - this.lastConnect) / 1000);
 		return interval - secondsSinceLast;
 	}