empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix NetworkResult handling of websocket timeouts.

Browse source
This commit is contained in:
Greyson Parrelli 2024-09-06 08:34:23 -04:00 • committed by Cody Henthorne
parent 85d90aa121
commit b858161f92
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt
View file

@ -6,10 +6,12 @@
package org.whispersystems.signalservice.api package org.whispersystems.signalservice.api
import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException
import org.whispersystems.signalservice.internal.util.JsonUtil import org.whispersystems.signalservice.internal.util.JsonUtil
import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage
import org.whispersystems.signalservice.internal.websocket.WebsocketResponse import org.whispersystems.signalservice.internal.websocket.WebsocketResponse
import java.io.IOException import java.io.IOException
import java.util.concurrent.TimeoutException
import kotlin.reflect.KClass import kotlin.reflect.KClass
typealias StatusCodeErrorAction = (NetworkResult.StatusCodeError<*>) -> Unit typealias StatusCodeErrorAction = (NetworkResult.StatusCodeError<*>) -> Unit
@ -67,6 +69,8 @@ sealed class NetworkResult<T>(
StatusCodeError(e) StatusCodeError(e)
} catch (e: IOException) { } catch (e: IOException) {
NetworkError(e) NetworkError(e)
} catch (e: TimeoutException) {
NetworkError(PushNetworkException(e))
} catch (e: Throwable) { } catch (e: Throwable) {
ApplicationError(e) ApplicationError(e)
} }