Go back to registration pin entry when SVR server returns an unknown error

Author: harry-signal

Signal/Registration/RegistrationCoordinatorImpl.swift

@@ -1560,7 +1560,21 @@ public class RegistrationCoordinatorImpl: RegistrationCoordinator {
                     }
                     return .value(.showErrorSheet(.networkError))
                 case .genericError:
-                    return .value(.showErrorSheet(.genericError))
+                    if retriesLeft > 0 {
+                        return self.restoreSVRMasterSecretForAuthCredentialPath(
+                            pin: pin,
+                            credential: credential,
+                            retriesLeft: retriesLeft - 1
+                        )
+                    } else {
+                        self.inMemoryState.pinFromUser = nil
+                        return .value(.pinEntry(RegistrationPinState(
+                            operation: .enteringExistingPin(skippability: .canSkip, remainingAttempts: nil),
+                            error: .serverError,
+                            contactSupportMode: self.contactSupportRegistrationPINMode(),
+                            exitConfiguration: pinCodeEntryExitConfiguration()
+                        )))
+                    }
                 }
             }
     }
@@ -2956,8 +2970,24 @@ public class RegistrationCoordinatorImpl: RegistrationCoordinator {
                 case .genericError(let error):
                     if error.isPostRegDeregisteredError {
                         return self.becameDeregisteredBeforeCompleting(accountIdentity: accountIdentity)
+                    } else if retriesLeft > 0 {
+                        return self.restoreSVRBackupPostRegistration(
+                            pin: pin,
+                            accountIdentity: accountIdentity,
+                            retriesLeft: retriesLeft - 1
+                        )
+                    } else {
+                        self.inMemoryState.pinFromUser = nil
+                        return .value(.pinEntry(RegistrationPinState(
+                            operation: .enteringExistingPin(
+                                skippability: .canSkipAndCreateNew,
+                                remainingAttempts: nil
+                            ),
+                            error: .serverError,
+                            contactSupportMode: self.contactSupportRegistrationPINMode(),
+                            exitConfiguration: self.pinCodeEntryExitConfiguration()
+                        )))
                     }
-                    return .value(.showErrorSheet(.genericError))
                 }
             }
     }

Signal/Registration/UserInterface/RegistrationPinViewController.swift

@@ -29,6 +29,7 @@ public struct RegistrationPinConfirmationBlob: Equatable {
 
 public enum RegistrationPinValidationError: Equatable {
     case wrongPin(wrongPin: String)
+    case serverError
 }
 
 // MARK: - RegistrationPinState
@@ -525,6 +526,12 @@ class RegistrationPinViewController: OWSViewController {
                 )
             }
             newViewsAtTheBottom.append(pinValidationLabel)
+        case .serverError:
+            pinValidationLabel.text = OWSLocalizedString(
+                "SOMETHING_WENT_WRONG_TRY_AGAIN_LATER_ERROR",
+                comment: "An error message generically indicating that something went wrong, and that the user should try again later."
+            )
+            newViewsAtTheBottom.append(pinValidationLabel)
         }
         pinValidationLabel.textColor = .ows_accentRed