Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-26 20:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generalize preventing WebSocket from connecting in various app states.

Browse Source
This commit is contained in:
Cody Henthorne
2025-04-02 11:00:35 -04:00
committed by Michelle Tang
parent ecb040ce98
commit fcc6032ee0
4 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java
View File

@@ -47,6 +47,7 @@ import org.thoughtcrime.securesms.jobs.TypingSendJob;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.megaphone.MegaphoneRepository;
import org.thoughtcrime.securesms.messages.IncomingMessageObserver;
import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor;
import org.thoughtcrime.securesms.net.SignalWebSocketHealthMonitor;
import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
@@ -339,7 +340,10 @@ public class ApplicationDependencyProvider implements AppDependencies.Provider {
}
};
SignalWebSocket.AuthenticatedWebSocket webSocket = new SignalWebSocket.AuthenticatedWebSocket(authFactory, sleepTimer, TimeUnit.SECONDS.toMillis(10));
SignalWebSocket.AuthenticatedWebSocket webSocket = new SignalWebSocket.AuthenticatedWebSocket(authFactory,
() -> !SignalStore.misc().isClientDeprecated() && !DeviceTransferBlockingInterceptor.getInstance().isBlockingNetwork(),
sleepTimer,
TimeUnit.SECONDS.toMillis(10));
if (AppForegroundObserver.isForegrounded()) {
webSocket.registerKeepAliveToken(SignalWebSocket.FOREGROUND_KEEPALIVE);
}
@@ -372,7 +376,10 @@ public class ApplicationDependencyProvider implements AppDependencies.Provider {
}
};
SignalWebSocket.UnauthenticatedWebSocket webSocket = new SignalWebSocket.UnauthenticatedWebSocket(unauthFactory, sleepTimer, TimeUnit.SECONDS.toMillis(10));
SignalWebSocket.UnauthenticatedWebSocket webSocket = new SignalWebSocket.UnauthenticatedWebSocket(unauthFactory,
() -> !SignalStore.misc().isClientDeprecated() && !DeviceTransferBlockingInterceptor.getInstance().isBlockingNetwork(),
sleepTimer,
TimeUnit.SECONDS.toMillis(10));
if (AppForegroundObserver.isForegrounded()) {
webSocket.registerKeepAliveToken(SignalWebSocket.FOREGROUND_KEEPALIVE);
}

7
app/src/main/java/org/thoughtcrime/securesms/net/DeviceTransferBlockingInterceptor.java
View File

@@ -5,7 +5,6 @@ import androidx.annotation.NonNull;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
import java.io.IOException;
@@ -49,15 +48,17 @@ public final class DeviceTransferBlockingInterceptor implements Interceptor {
.build();
}
public boolean isBlockingNetwork() {
return blockNetworking;
}
public void blockNetwork() {
blockNetworking = true;
SignalWebSocket.setCanConnect(false);
AppDependencies.resetNetwork();
}
public void unblockNetwork() {
blockNetworking = false;
SignalWebSocket.setCanConnect(true);
AppDependencies.startNetwork();
}
}

10
app/src/main/java/org/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor.kt
View File

@@ -102,7 +102,15 @@ class SignalWebSocketHealthMonitor(
}
}
override fun onMessageError(status: Int, isIdentifiedWebSocket: Boolean) = Unit
override fun onMessageError(status: Int, isIdentifiedWebSocket: Boolean) {
executor.execute {
if (status == 499 && !SignalStore.misc.isClientDeprecated) {
Log.w(TAG, "Received 499. Client version is deprecated.", true)
SignalStore.misc.isClientDeprecated = true
webSocket?.forceNewWebSocket()
}
}
}
private fun updateKeepAliveSenderStatus() {
if (keepAliveSender == null && sendKeepAlives()) {