Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error handling in NetworkResult.fromWebSocketRequest()

Browse Source
This commit is contained in:
Greyson Parrelli
2024-09-03 10:04:31 -04:00
committed by Cody Henthorne
parent 6c09b59d1b
commit e5b482c7ad
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt
View File

@@ -58,10 +58,11 @@ sealed class NetworkResult<T>(
request: WebSocketRequestMessage,
clazz: KClass<T>
): NetworkResult<T> = try {
val result = signalWebSocket.request(request)
.map { response: WebsocketResponse -> JsonUtil.fromJson(response.body, clazz.java) }
val result: Result<T> = signalWebSocket.request(request)
.map { response: WebsocketResponse -> Result.success(JsonUtil.fromJson(response.body, clazz.java)) }
.onErrorReturn { Result.failure<T>(it) }
.blockingGet()
Success(result)
Success(result.getOrThrow())
} catch (e: NonSuccessfulResponseCodeException) {
StatusCodeError(e)
} catch (e: IOException) {