Close unidentified websocket when the app is in background

signalapp · Dec 29, 2023 · ce18927 · ce18927
1 parent e17b07b
commit ce18927
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt
@@ -172,6 +172,20 @@ class IncomingMessageObserver(private val context: Application) {
     }
   }
 
+  private fun mayDisconnectUnidentified() {
+    val timeIdle: Long
+    val appVisibleSnapshot: Boolean
+
+    lock.withLock {
+      appVisibleSnapshot = appVisible
+      timeIdle = if (appVisibleSnapshot) 0 else System.currentTimeMillis() - lastInteractionTime
+    }
+    if (!appVisibleSnapshot && timeIdle < maxBackgroundTime) {
+      Log.d(TAG, "Disconnecting unidentified websocket")
+      ApplicationDependencies.getSignalWebSocket().disconnectUnidentified()
+    }
+  }
+
   private fun isConnectionNecessary(): Boolean {
     val timeIdle: Long
     val keepAliveEntries: Set<Pair<String, Long>>
@@ -384,6 +398,7 @@ class IncomingMessageObserver(private val context: Application) {
           while (isConnectionNecessary()) {
             try {
               Log.d(TAG, "Reading message...")
+              mayDisconnectUnidentified()
 
               val hasMore = signalWebSocket.readMessageBatch(websocketReadTimeout, 30) { batch ->
                 Log.i(TAG, "Retrieved ${batch.size} envelopes!")

diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor.java b/app/src/main/java/org/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor.java
@@ -134,6 +134,13 @@ public void onMessageError(int status, boolean isIdentifiedWebSocket) {
     });
   }
 
+  @Override
+  public void needsKeepAlive(boolean need, boolean isIdentifiedWebSocket) {
+    if (!isIdentifiedWebSocket) {
+      unidentified.needsKeepAlive = need;
+    }
+  }
+
   private boolean isKeepAliveNecessary() {
     return identified.needsKeepAlive || unidentified.needsKeepAlive;
   }
@@ -172,7 +179,8 @@ public void run() {
           sleepUntil(responseRequiredTime);
 
           if (shouldKeepRunning && isKeepAliveNecessary()) {
-            if (identified.lastKeepAliveReceived < keepAliveSendTime || unidentified.lastKeepAliveReceived < keepAliveSendTime) {
+            if ((identified.needsKeepAlive && identified.lastKeepAliveReceived < keepAliveSendTime) ||
+                (unidentified.needsKeepAlive && unidentified.lastKeepAliveReceived < keepAliveSendTime)) {
               Log.w(TAG, "Missed keep alives, identified last: " + identified.lastKeepAliveReceived +
                          " unidentified last: " + unidentified.lastKeepAliveReceived +
                          " needed by: " + responseRequiredTime);

diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
@@ -122,7 +122,7 @@ private void disconnectIdentified() {
     }
   }
 
-  private void disconnectUnidentified() {
+  public void disconnectUnidentified() {
     if (unidentifiedWebSocket != null) {
       unidentifiedWebSocketStateDisposable.dispose();
 
@@ -183,7 +183,9 @@ public synchronized void sendKeepAlive() throws IOException {
     if (canConnect) {
       try {
         getWebSocket().sendKeepAlive();
-        getUnidentifiedWebSocket().sendKeepAlive();
+        if (unidentifiedWebSocket != null && !unidentifiedWebSocket.isDead()) {
+          getUnidentifiedWebSocket().sendKeepAlive();
+        }
       } catch (WebSocketUnavailableException e) {
         throw new AssertionError(e);
       }

diff --git a/...l-service/src/main/java/org/whispersystems/signalservice/api/websocket/HealthMonitor.java b/...l-service/src/main/java/org/whispersystems/signalservice/api/websocket/HealthMonitor.java
@@ -7,4 +7,6 @@ public interface HealthMonitor {
   void onKeepAliveResponse(long sentTimestamp, boolean isIdentifiedWebSocket);
 
   void onMessageError(int status, boolean isIdentifiedWebSocket);
+
+  void needsKeepAlive(boolean need, boolean isIdentifiedWebSocket);
 }
diff --git a/...rc/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java b/...rc/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java
@@ -175,6 +175,7 @@ public synchronized Observable<WebSocketConnectionState> connect() {
       }
 
       webSocketState.onNext(WebSocketConnectionState.CONNECTING);
+      healthMonitor.needsKeepAlive(true, credentialsProvider.isPresent());
 
       this.client = okHttpClient.newWebSocket(requestBuilder.build(), this);
     }
@@ -192,6 +193,7 @@ public synchronized void disconnect() {
       client.close(1000, "OK");
       client = null;
       webSocketState.onNext(WebSocketConnectionState.DISCONNECTING);
+      healthMonitor.needsKeepAlive(false, credentialsProvider.isPresent());
     }
 
     notifyAll();