Merge branch 'charlesmchen/moreRetainUntilComplete'

Signal/src/ViewControllers/OWS2FARegistrationViewController.m

@@ -107,7 +107,7 @@ NS_ASSUME_NONNULL_BEGIN
                         canCancel:NO
                   backgroundBlock:^(ModalActivityIndicatorViewController *modalActivityIndicator) {
                       OWSProdInfo([OWSAnalyticsEvents registrationRegisteringCode]);
-                      [self.accountManager registerObjcWithVerificationCode:self.verificationCode pin:pinCode]
+                      [[self.accountManager registerObjcWithVerificationCode:self.verificationCode pin:pinCode]
                               .then(^{
                                   OWSAssertIsOnMainThread();
                                   OWSProdInfo([OWSAnalyticsEvents registrationRegisteringSubmittedCode]);
@@ -130,7 +130,8 @@ NS_ASSUME_NONNULL_BEGIN
                                       [modalActivityIndicator dismissWithCompletion:^{
                                           OWSAssertIsOnMainThread();
 
-                                      [OWSAlerts showAlertWithTitle:NSLocalizedString(
+                                          [OWSAlerts
+                                              showAlertWithTitle:NSLocalizedString(
                                                                      @"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE",
                                                                      @"Title for alert indicating that attempt to "
                                                                      @"register with 'two-factor auth' failed.")
@@ -139,7 +140,7 @@ NS_ASSUME_NONNULL_BEGIN
                                           [weakSelf.entryView makePinTextFieldFirstResponder];
                                       }];
                                   });
-                          });
+                              }) retainUntilComplete];
                   }];
 }
 

Signal/src/util/Backup/OWSBackupImportJob.m

@@ -187,8 +187,9 @@ NSString *const kOWSBackup_ImportDatabaseKeySpec = @"kOWSBackup_ImportDatabaseKe
             [OWSBackup.sharedManager setIsBackupEnabled:YES];
         })
         .thenInBackground(^{
-            [self.tsAccountManager updateAccountAttributes];
+            return [self.tsAccountManager updateAccountAttributes];
-
+        })
+        .thenInBackground(^{
             [self succeed];
         });
 }

SignalMessaging/environment/migrations/OWS111UDAttributesMigration.swift

@@ -33,7 +33,7 @@ public class OWS111UDAttributesMigration: OWSDatabaseMigration {
     }
 
     private func doMigration() {
-        tsAccountManager.updateAccountAttributes()
+        tsAccountManager.updateAccountAttributes().retainUntilComplete()
 
         self.dbReadWriteConnection().readWrite { transaction in
             self.save(with: transaction)

SignalMessaging/profiles/OWSProfileManager.m

@@ -860,7 +860,7 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
 {
     OWSUserProfile *userProfile = self.localUserProfile;
     [userProfile clearWithProfileKey:[OWSAES256Key generateRandomKey] dbConnection:self.dbConnection completion:nil];
-    [self.tsAccountManager updateAccountAttributes];
+    [[self.tsAccountManager updateAccountAttributes] retainUntilComplete];
 }
 
 - (void)addUserToProfileWhitelist:(NSString *)recipientId

SignalServiceKit/src/Account/TSAccountManager.m

@@ -86,7 +86,7 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa
     }
 
     [AppReadiness runNowOrWhenAppDidBecomeReady:^{
-        [self updateAccountAttributesIfNecessary];
+        [[self updateAccountAttributesIfNecessary] retainUntilComplete];
     }];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
@@ -721,7 +721,7 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa
     OWSAssertIsOnMainThread();
 
     [AppReadiness runNowOrWhenAppDidBecomeReady:^{
-        [self updateAccountAttributesIfNecessary];
+        [[self updateAccountAttributesIfNecessary] retainUntilComplete];
     }];
 }
 

SignalServiceKit/src/Messages/UD/OWSUDManager.swift

@@ -485,6 +485,6 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
         dbConnection.setBool(value, forKey: kUDUnrestrictedAccessKey, inCollection: kUDCollection)
 
         // Try to update the account attributes to reflect this change.
-        tsAccountManager.updateAccountAttributes()
+        tsAccountManager.updateAccountAttributes().retainUntilComplete()
     }
 }

SignalServiceKit/src/Util/OWS2FAManager.m

@@ -10,6 +10,7 @@
 #import "TSAccountManager.h"
 #import "TSNetworkManager.h"
 #import "YapDatabaseConnection+OWS.h"
+#import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -89,7 +90,7 @@ const NSUInteger kDaySecs = kHourSecs * 24;
                                                              object:nil
                                                            userInfo:nil];
 
-    [self.tsAccountManager updateAccountAttributes];
+    [[self.tsAccountManager updateAccountAttributes] retainUntilComplete];
 }
 
 - (void)mark2FAAsEnabledWithPin:(NSString *)pin
@@ -105,7 +106,7 @@ const NSUInteger kDaySecs = kHourSecs * 24;
                                                              object:nil
                                                            userInfo:nil];
 
-    [self.tsAccountManager updateAccountAttributes];
+    [[self.tsAccountManager updateAccountAttributes] retainUntilComplete];
 }
 
 - (void)requestEnable2FAWithPin:(NSString *)pin