Don't show permissions pop-up until user has seen contact disclaimer (signalapp#1456)

// FREEBIE

Author: michaelkirk

Signal/src/view controllers/SignalsViewController.m

@@ -190,13 +190,6 @@ - (void)viewDidAppear:(BOOL)animated {
 }
 
 - (void)didAppearForNewlyRegisteredUser
-{
-    [self promptNewUserForContactsWithCompletion:^{
-        [self ensureNotificationsUpToDate];
-    }];
-}
-
-- (void)promptNewUserForContactsWithCompletion:(void (^)())completionHandler
 {
     ABAuthorizationStatus status = ABAddressBookGetAuthorizationStatus();
     switch (status) {
@@ -212,16 +205,18 @@ - (void)promptNewUserForContactsWithCompletion:(void (^)())completionHandler
                               actionWithTitle:NSLocalizedString(@"REGISTER_CONTACTS_CONTINUE", nil)
                                         style:UIAlertActionStyleCancel
                                       handler:^(UIAlertAction *action) {
+                                          [self ensureNotificationsUpToDate];
                                           [[Environment getCurrent].contactsManager doAfterEnvironmentInitSetup];
                                       }]];
 
-            [self presentViewController:controller animated:YES completion:completionHandler];
+            [self presentViewController:controller animated:YES completion:nil];
             break;
         }
         default: {
             DDLogError(@"%@ Unexpected for new user to have kABAuthorizationStatus:%ld", self.tag, status);
+            [self ensureNotificationsUpToDate];
             [[Environment getCurrent].contactsManager doAfterEnvironmentInitSetup];
-            completionHandler();
+
             break;
         }
     }