signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Ensure we mark 2fa as disabled if we delete keys, regardless of success or

Browse Source 
failure
This commit is contained in:
Nora Trapp 2020-06-02 18:20:56 -07:00
parent a64b582798
commit 9c7d21044e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
SignalServiceKit/src/Util/OWS2FAManager.m
View File

@ -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();