Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add remote config to split libsignal-net support for standard vs proxied.

Browse Source
This commit is contained in:
andrew-signal
2025-08-06 15:13:05 -04:00
committed by Cody Henthorne
parent 95ff2886cd
commit 303174c864
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,6 +316,23 @@ public class ApplicationDependencyProvider implements AppDependencies.Provider {
return new PendingRetryReceiptCache();
}
private boolean shouldUseLibsignalForWebsocket(@NonNull SignalServiceConfiguration signalServiceConfiguration) {
if (RemoteConfig.libSignalWebSocketEnabled()) {
if (RemoteConfig.libSignalWebSocketEnabledForProxies()) {
return true;
} else {
// libsignalWebSocketEnabled = true but libsignalWebSocketEnabledForProxies = false
if (signalServiceConfiguration.getCensored() ||
signalServiceConfiguration.getSignalProxy().isPresent()) {
return false;
} else {
return true;
}
}
} else {
return false;
}
}
@Override
public @NonNull SignalWebSocket.AuthenticatedWebSocket provideAuthWebSocket(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier, @NonNull Supplier<Network> libSignalNetworkSupplier) {
SleepTimer sleepTimer = !SignalStore.account().isFcmEnabled() || SignalStore.internal().isWebsocketModeForced() ? new AlarmSleepTimer(context) : new UptimeSleepTimer();
@@ -328,7 +345,7 @@ public class ApplicationDependencyProvider implements AppDependencies.Provider {
throw new WebSocketUnavailableException("Invalid auth credentials");
}
if (RemoteConfig.libSignalWebSocketEnabled()) {
if (shouldUseLibsignalForWebsocket(signalServiceConfigurationSupplier.get())) {
Network network = libSignalNetworkSupplier.get();
return new LibSignalChatConnection("libsignal-auth",
network,
@@ -364,7 +381,7 @@ public class ApplicationDependencyProvider implements AppDependencies.Provider {
SignalWebSocketHealthMonitor healthMonitor = new SignalWebSocketHealthMonitor(sleepTimer);
WebSocketFactory unauthFactory = () -> {
if (RemoteConfig.libSignalWebSocketEnabled()) {
if (shouldUseLibsignalForWebsocket(signalServiceConfigurationSupplier.get())) {
Network network = libSignalNetworkSupplier.get();
return new LibSignalChatConnection("libsignal-unauth",
network,

16
app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
View File

@@ -1023,11 +1023,23 @@ object RemoteConfig {
value.asLong(8.kibiBytes.inWholeBytes).bytes
}
/** Whether unauthenticated chat web socket is backed by libsignal-net */
/** Whether the chat web socket is backed by libsignal for direct connections */
@JvmStatic
@get:JvmName("libSignalWebSocketEnabled")
val libSignalWebSocketEnabled: Boolean by remoteValue(
key = "android.libsignalWebSocketEnabled.7",
key = "android.libsignalWebSocketEnabled.8",
hotSwappable = false
) { value ->
value.asBoolean(false) || Environment.IS_NIGHTLY
}
/** Whether the chat web socket is backed by libsignal for all connections, including proxied connections.
* Note, this does *not* gate HTTP proxies, which are treated as direct connections.
* This only has an effect if libSignalWebSocketEnabled is also enabled. */
@JvmStatic
@get:JvmName("libSignalWebSocketEnabledForProxies")
val libSignalWebSocketEnabledForProxies: Boolean by remoteValue(
key = "android.libSignalWebSocketEnabledForProxies.8",
hotSwappable = false
) { value ->
value.asBoolean(false) || Environment.IS_NIGHTLY