Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Abort re-reg with pin flow if unable to communicate via svr websocket.

Browse Source
This commit is contained in:
Cody Henthorne
2025-12-18 14:55:45 -05:00
committed by jeffrey-signal
parent 9db33c3fec
commit 26b8de2282
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
View File

@@ -96,6 +96,7 @@ import org.whispersystems.signalservice.internal.push.AuthCredentials
import org.whispersystems.signalservice.internal.push.ProvisionMessage
import org.whispersystems.signalservice.internal.push.SyncMessage
import java.io.IOException
import java.net.ProtocolException
import java.nio.charset.StandardCharsets
import kotlin.jvm.optionals.getOrNull
import kotlin.math.max
@@ -692,6 +693,14 @@ class RegistrationViewModel : ViewModel() {
Log.w(TAG, "SVR has no data for these credentials. Aborting skip SMS flow.", noData)
updateSvrTriesRemaining(0)
setUserSkippedReRegisterFlow(true)
} catch (ioe: IOException) {
if (ioe.cause is ProtocolException) {
Log.w(TAG, "Network error attempting to communicate with SVR, likely web socket http protocol exception. Skipping re-reg", ioe)
setUserSkippedReRegisterFlow(true)
} else {
Log.w(TAG, "Network error attempting to communicate with SVR.", ioe)
handleGenericError(ioe)
}
}
}
return