From f40bc944ae54a51f10f8102823cd423a1ba91fc4 Mon Sep 17 00:00:00 2001
From: Max Radermacher <max@signal.org>
Date: Thu, 4 Jun 2026 19:38:23 -0500
Subject: [PATCH] =?UTF-8?q?Remove=20throws=20from=20method=20that=20doesn?=
 =?UTF-8?q?=E2=80=99t=20throw?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProvisioningCoordinatorImpl.swift         | 22 +++++--------------
 .../SecureValueRecoveryMock.swift             |  2 +-
 .../SecureValueRecovery.swift                 |  2 +-
 .../SecureValueRecovery2Impl.swift            |  2 +-
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/Signal/Provisioning/ProvisioningCoordinatorImpl.swift b/Signal/Provisioning/ProvisioningCoordinatorImpl.swift
index 454dd859d2..ae2cdf19f0 100644
--- a/Signal/Provisioning/ProvisioningCoordinatorImpl.swift
+++ b/Signal/Provisioning/ProvisioningCoordinatorImpl.swift
@@ -362,23 +362,11 @@ class ProvisioningCoordinatorImpl: ProvisioningCoordinator {
             self.tsAccountManager.setRegistrationId(aciRegistrationId, for: .aci, tx: tx)
             self.tsAccountManager.setRegistrationId(pniRegistrationId, for: .pni, tx: tx)
 
-            do {
-                try svr.storeKeys(
-                    fromProvisioningMessage: provisionMessage,
-                    authedDevice: .explicit(authedDevice),
-                    tx: tx,
-                )
-            } catch {
-                switch error {
-                case SVR.KeysError.missingMasterKey:
-                    owsFailDebug("Failed to store master key from provisioning message")
-                    return .obsoleteLinkedDeviceError
-                case SVR.KeysError.missingOrInvalidMRBK:
-                    return .obsoleteLinkedDeviceError
-                default:
-                    owsFailDebug("Unexpected Error")
-                }
-            }
+            self.svr.storeKeys(
+                fromProvisioningMessage: provisionMessage,
+                authedDevice: .explicit(authedDevice),
+                tx: tx,
+            )
 
             self.receiptManager.setAreReadReceiptsEnabled(
                 provisionMessage.areReadReceiptsEnabled,
diff --git a/SignalServiceKit/Mocks/KeyBackupService/SecureValueRecoveryMock.swift b/SignalServiceKit/Mocks/KeyBackupService/SecureValueRecoveryMock.swift
index 5d91ac6906..57c412eee9 100644
--- a/SignalServiceKit/Mocks/KeyBackupService/SecureValueRecoveryMock.swift
+++ b/SignalServiceKit/Mocks/KeyBackupService/SecureValueRecoveryMock.swift
@@ -45,7 +45,7 @@ public class SecureValueRecoveryMock: SecureValueRecovery {
         fromProvisioningMessage provisioningMessage: LinkingProvisioningMessage,
         authedDevice: AuthedDevice,
         tx: DBWriteTransaction,
-    ) throws(SVR.KeysError) {
+    ) {
         let masterKey = switch provisioningMessage.rootKey {
         case .accountEntropyPool(let aep): aep.getMasterKey()
         case .masterKey(let masterKey): masterKey
diff --git a/SignalServiceKit/SecureValueRecovery/SecureValueRecovery.swift b/SignalServiceKit/SecureValueRecovery/SecureValueRecovery.swift
index 70da9d1a72..74c6322e78 100644
--- a/SignalServiceKit/SecureValueRecovery/SecureValueRecovery.swift
+++ b/SignalServiceKit/SecureValueRecovery/SecureValueRecovery.swift
@@ -119,5 +119,5 @@ public protocol SecureValueRecovery {
         fromProvisioningMessage provisioningMessage: LinkingProvisioningMessage,
         authedDevice: AuthedDevice,
         tx: DBWriteTransaction,
-    ) throws(SVR.KeysError)
+    )
 }
diff --git a/SignalServiceKit/SecureValueRecovery/SecureValueRecovery2Impl.swift b/SignalServiceKit/SecureValueRecovery/SecureValueRecovery2Impl.swift
index 1d4b0075e1..996788a559 100644
--- a/SignalServiceKit/SecureValueRecovery/SecureValueRecovery2Impl.swift
+++ b/SignalServiceKit/SecureValueRecovery/SecureValueRecovery2Impl.swift
@@ -92,7 +92,7 @@ public class SecureValueRecovery2Impl: SecureValueRecovery {
         fromProvisioningMessage provisioningMessage: LinkingProvisioningMessage,
         authedDevice: AuthedDevice,
         tx: DBWriteTransaction,
-    ) throws(SVR.KeysError) {
+    ) {
         Logger.info("")
         accountKeyStore.setMediaRootBackupKey(provisioningMessage.mrbk, tx: tx)