From 9c7d21044e5a2f5e5b6cba2d3e87cd7e2966cbda Mon Sep 17 00:00:00 2001
From: Nora Trapp <nora@signal.org>
Date: Tue, 2 Jun 2020 18:20:56 -0700
Subject: [PATCH] Ensure we mark 2fa as disabled if we delete keys, regardless
 of success or failure

---
 SignalServiceKit/src/Util/OWS2FAManager.m | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/SignalServiceKit/src/Util/OWS2FAManager.m b/SignalServiceKit/src/Util/OWS2FAManager.m
index b825b43c0d..cb3ee67e93 100644
--- a/SignalServiceKit/src/Util/OWS2FAManager.m
+++ b/SignalServiceKit/src/Util/OWS2FAManager.m
@@ -260,18 +260,20 @@ const NSUInteger kLegacyTruncated2FAv1PinLength = 16;
                 .then(^{
                     return [self disableRegistrationLockV2];
                 })
-                .then(
-                    ^() {
-                        OWSAssertIsOnMainThread();
+                .ensure(^{
+                    OWSAssertIsOnMainThread();
 
-                        [self.databaseStorage writeWithBlock:^(SDSAnyWriteTransaction *transaction) {
-                            [self markDisabledWithTransaction:transaction];
-                        }];
+                    [self.databaseStorage writeWithBlock:^(SDSAnyWriteTransaction *transaction) {
+                        [self markDisabledWithTransaction:transaction];
+                    }];
+                })
+                .then(^() {
+                    OWSAssertIsOnMainThread();
 
-                        if (success) {
-                            success();
-                        }
-                    })
+                    if (success) {
+                        success();
+                    }
+                })
                 .catch(^(NSError *error) {
                     OWSAssertIsOnMainThread();