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

Fix libsignal-net crashes around CONNECTING state.

Browse Source
This commit is contained in:
andrew-signal
2025-02-07 15:30:20 -05:00
committed by Greyson Parrelli
parent 7c7dc679e9
commit 02bf7edb18
2 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt
View File

@@ -165,10 +165,15 @@ class LibSignalChatConnection(
chatConnectionFuture.whenComplete(
onSuccess = { connection ->
CHAT_SERVICE_LOCK.withLock {
chatConnection = connection
connection?.start()
Log.i(TAG, "$name Connected")
state.onNext(WebSocketConnectionState.CONNECTED)
if (state.value == WebSocketConnectionState.CONNECTING) {
chatConnection = connection
connection?.start()
Log.i(TAG, "$name Connected")
state.onNext(WebSocketConnectionState.CONNECTED)
} else {
Log.i(TAG, "$name Dropped successful connection because we are now ${state.value}")
disconnect()
}
}
},
onFailure = { throwable ->
@@ -214,6 +219,18 @@ class LibSignalChatConnection(
return
}
// This avoids a crash when we get a connection lost event during a connection attempt and try
// to cancel a connection that has not yet been fully established.
// TODO [andrew]: Figure out if this is the right long term behavior.
if (state.value == WebSocketConnectionState.CONNECTING) {
// The right way to do this is to cancel the CompletableFuture returned by connectChat()
// Unfortunately, libsignal's CompletableFuture does not yet support cancellation.
// Instead, we set a flag to disconnect() as soon as the connection completes.
// TODO [andrew]: Add cancellation support to CompletableFuture and use it here
state.onNext(WebSocketConnectionState.DISCONNECTING)
return
}
Log.i(TAG, "$name Disconnecting...")
state.onNext(WebSocketConnectionState.DISCONNECTING)
chatConnection!!.disconnect()
@@ -236,6 +253,14 @@ class LibSignalChatConnection(
if (isDead()) {
return Single.error(IOException("$name is closed!"))
}
// This avoids a crash loop when we try to send queued messages on app open before the connection
// is fully established.
// TODO [andrew]: Figure out if this is the right long term behavior.
if (state.value == WebSocketConnectionState.CONNECTING) {
return Single.error(IOException("$name is still connecting!"))
}
val single = SingleSubject.create<WebsocketResponse>()
val internalRequest = request.toLibSignalRequest()
chatConnection!!.send(internalRequest)