Sketch out the backup restore view.

Signal/src/ViewControllers/ProfileViewController.m

@@ -383,33 +383,28 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat
     }
 
     // Show an activity indicator to block the UI during the profile upload.
-    UIAlertController *alertController = [UIAlertController
+    [ModalActivityIndicatorViewController
-        alertControllerWithTitle:NSLocalizedString(@"PROFILE_VIEW_SAVING",
+        presentFromViewController:self
-                                     @"Alert title that indicates the user's profile view is being saved.")
+                        canCancel:NO
-                         message:nil
+                  backgroundBlock:^(ModalActivityIndicatorViewController *modalActivityIndicator) {
-                  preferredStyle:UIAlertControllerStyleAlert];
-
-    [self presentViewController:alertController
-                       animated:YES
-                     completion:^{
                       [OWSProfileManager.sharedManager updateLocalProfileName:normalizedProfileName
                           avatarImage:self.avatar
                           success:^{
-                                 [alertController dismissViewControllerAnimated:NO
+                              dispatch_async(dispatch_get_main_queue(), ^{
-                                                                     completion:^{
+                                  [modalActivityIndicator dismissWithCompletion:^{
                                       [weakSelf updateProfileCompleted];
                                   }];
+                              });
                           }
                           failure:^{
-                                 [alertController
+                              dispatch_async(dispatch_get_main_queue(), ^{
-                                     dismissViewControllerAnimated:NO
+                                  [modalActivityIndicator dismissWithCompletion:^{
-                                                        completion:^{
+                                      [OWSAlerts showErrorAlertWithMessage:NSLocalizedString(
-                                                            [OWSAlerts showErrorAlertWithMessage:
-                                                                           NSLocalizedString(
                                                                                @"PROFILE_VIEW_ERROR_UPDATE_FAILED",
                                                                                @"Error message shown when a "
                                                                                @"profile update fails.")];
                                   }];
+                              });
                           }];
                   }];
 }
@@ -450,6 +445,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat
 
 - (void)showHomeView
 {
+    OWSAssertIsOnMainThread();
     OWSLogVerbose(@"");
 
     [SignalApp.sharedApp showHomeView];
@@ -457,6 +453,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat
 
 - (void)showBackupRestoreView
 {
+    OWSAssertIsOnMainThread();
     OWSLogVerbose(@"");
 
     BackupRestoreViewController *restoreView = [BackupRestoreViewController new];

Signal/src/ViewControllers/Registration/BackupRestoreViewController.swift

@@ -14,6 +14,8 @@ public class BackupRestoreViewController: OWSTableViewController {
     }
 
     override public func loadView() {
+        super.loadView()
+
         navigationItem.title = NSLocalizedString("SETTINGS_BACKUP", comment: "Label for the backup view in app settings.")
 
         navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(didPressCancelButton))