diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt index e3798c0b58..b7bd834d92 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt @@ -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