Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-07-12 16:57:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add handling for AppExpiredConnection in LibSignalChatConnection:connect.

Browse Source 
Co-authored-by: Cody Henthorne <cody@signal.org>
This commit is contained in:
andrew-signal
2025-03-28 11:30:52 -04:00
committed by Greyson Parrelli
parent defe94c4fa
commit 88fd8fb36b
5 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
+3 -1
View File
@@ -310,7 +310,9 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
when (state) {
WebSocketConnectionState.CONNECTING, WebSocketConnectionState.DISCONNECTING, WebSocketConnectionState.DISCONNECTED -> proxyStatus.setImageResource(R.drawable.ic_proxy_connecting_24)
WebSocketConnectionState.CONNECTED -> proxyStatus.setImageResource(R.drawable.ic_proxy_connected_24)
WebSocketConnectionState.AUTHENTICATION_FAILED, WebSocketConnectionState.FAILED -> proxyStatus.setImageResource(R.drawable.ic_proxy_failed_24)
WebSocketConnectionState.AUTHENTICATION_FAILED,
WebSocketConnectionState.REMOTE_DEPRECATED,
WebSocketConnectionState.FAILED -> proxyStatus.setImageResource(R.drawable.ic_proxy_failed_24)
else -> proxyStatus.visibility = View.GONE
}
} else {
app/src/main/java/org/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor.kt
+7 -1
View File
@@ -9,6 +9,7 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
import io.reactivex.rxjava3.schedulers.Schedulers
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.util.TextSecurePreferences
import org.whispersystems.signalservice.api.util.SleepTimer
import org.whispersystems.signalservice.api.websocket.HealthMonitor
@@ -17,7 +18,6 @@ import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection
import java.util.concurrent.Executor
import java.util.concurrent.Executors
import kotlin.concurrent.Volatile
import kotlin.time.Duration
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.seconds
@@ -80,6 +80,12 @@ class SignalWebSocketHealthMonitor(
TextSecurePreferences.setUnauthorizedReceived(AppDependencies.application, true)
}
}
WebSocketConnectionState.REMOTE_DEPRECATED -> {
if (!SignalStore.misc.isClientDeprecated) {
Log.w(TAG, "Received remote deprecation. Client version is deprecated.", true)
SignalStore.misc.isClientDeprecated = true
}
}
else -> Unit
}
app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java
+1
View File
@@ -142,6 +142,7 @@ public class EditProxyFragment extends Fragment {
proxyStatus.setTextColor(getResources().getColor(R.color.signal_accent_green));
break;
case AUTHENTICATION_FAILED:
case REMOTE_DEPRECATED:
case FAILED:
proxyStatus.setText(R.string.preferences_connection_failed);
proxyStatus.setTextColor(getResources().getColor(R.color.signal_alert_primary));
libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketConnectionState.java
+2 -1
View File
@@ -10,9 +10,10 @@ public enum WebSocketConnectionState {
RECONNECTING,
DISCONNECTING,
AUTHENTICATION_FAILED,
REMOTE_DEPRECATED,
FAILED;
public boolean isFailure() {
return this == AUTHENTICATION_FAILED || this == FAILED;
return this == AUTHENTICATION_FAILED || this == REMOTE_DEPRECATED || this == FAILED;
}
}
libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt
+14 -5
View File
@@ -14,6 +14,7 @@ import okio.ByteString
import okio.ByteString.Companion.toByteString
import org.signal.core.util.logging.Log
import org.signal.libsignal.internal.CompletableFuture
import org.signal.libsignal.net.AppExpiredException
import org.signal.libsignal.net.AuthenticatedChatConnection
import org.signal.libsignal.net.ChatConnection
import org.signal.libsignal.net.ChatConnectionListener
@@ -192,10 +193,17 @@ class LibSignalChatConnection(
// request returns HTTP 403.
// The chat service currently does not return HTTP 401 on /v1/websocket.
// Thus, this currently matches the implementation in OkHttpWebSocketConnection.
if (throwable is DeviceDeregisteredException) {
state.onNext(WebSocketConnectionState.AUTHENTICATION_FAILED)
} else {
state.onNext(WebSocketConnectionState.FAILED)
when (throwable) {
is DeviceDeregisteredException -> {
state.onNext(WebSocketConnectionState.AUTHENTICATION_FAILED)
}
is AppExpiredException -> {
state.onNext(WebSocketConnectionState.REMOTE_DEPRECATED)
}
else -> {
Log.w(TAG, "Unknown connection failure reason", throwable)
state.onNext(WebSocketConnectionState.FAILED)
}
}
}
}
@@ -210,7 +218,8 @@ class LibSignalChatConnection(
WebSocketConnectionState.DISCONNECTED,
WebSocketConnectionState.DISCONNECTING,
WebSocketConnectionState.FAILED,
WebSocketConnectionState.AUTHENTICATION_FAILED -> true
WebSocketConnectionState.AUTHENTICATION_FAILED,
WebSocketConnectionState.REMOTE_DEPRECATED -> true
WebSocketConnectionState.CONNECTING,
WebSocketConnectionState.CONNECTED,