Clean up debug scaffolding.

// FREEBIE

Signal/src/ViewControllers/AddToBlockListViewController.m

@@ -105,6 +105,11 @@ NS_ASSUME_NONNULL_BEGIN
     return YES;
 }
 
+- (BOOL)shouldHideContacts
+{
+    return NO;
+}
+
 - (BOOL)shouldValidatePhoneNumbers
 {
     return NO;

Signal/src/ViewControllers/BlockListViewController.m

@@ -74,11 +74,6 @@ typedef NS_ENUM(NSInteger, BlockListViewControllerSection) {
 {
     [super viewDidLoad];
     [self.navigationController.navigationBar setTranslucent:NO];
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        AddToBlockListViewController *vc = [[AddToBlockListViewController alloc] init];
-        [self.navigationController pushViewController:vc animated:YES];
-    });
 }
 
 #pragma mark - Table view data source

Signal/src/ViewControllers/MessageComposeTableViewController.m

@@ -157,13 +157,6 @@ NSString *const MessageComposeTableViewControllerCellContact = @"ContactTableVie
     self.tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero];
     [self createLoadingAndBackgroundViews];
     self.title = NSLocalizedString(@"MESSAGE_COMPOSEVIEW_TITLE", @"");
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        NewGroupViewController *newGroupViewController = [NewGroupViewController new];
-        //            [[UIStoryboard main] instantiateViewControllerWithIdentifier:@"NewGroupViewController"];
-        //        [newGroupViewController configWithThread:(TSGroupThread *)self.thread];
-        [self.navigationController pushViewController:newGroupViewController animated:YES];
-    });
 }
 
 - (void)viewWillAppear:(BOOL)animated

Signal/src/ViewControllers/MessagesViewController.m

@@ -409,12 +409,6 @@ typedef enum : NSUInteger {
                                 contactsManager:self.contactsManager
                                 blockingManager:self.blockingManager];
     }
-    dispatch_async(dispatch_get_main_queue(), ^{
-        //        [self performSegueWithIdentifier:@"composeNew" sender:self];
-        //        TSThread *thread = [self threadForIndexPath:[NSIndexPath indexPathForItem:0 inSection:0]];
-        //        [self presentThread:thread keyboardOnViewAppearing:NO callOnViewAppearing:NO];
-        [self showConversationSettings];
-    });
 }
 
 - (void)viewDidLayoutSubviews
@@ -737,13 +731,6 @@ typedef enum : NSUInteger {
         _callOnOpen = NO;
     }
     [self updateNavigationBarSubtitleLabel];
-
-    //    dispatch_async(dispatch_get_main_queue(), ^{
-    //        //        [self performSegueWithIdentifier:@"composeNew" sender:self];
-    //        //        TSThread *thread = [self threadForIndexPath:[NSIndexPath indexPathForItem:0 inSection:0]];
-    //        //        [self presentThread:thread keyboardOnViewAppearing:NO callOnViewAppearing:NO];
-    //        [self showConversationSettings];
-    //    });
 }
 
 - (void)viewWillDisappear:(BOOL)animated {

Signal/src/ViewControllers/NewGroupViewController.m

@@ -499,9 +499,8 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert(image);
 
     self.avatarView.image = image;
-    // TODO.
+    self.avatarView.layer.borderColor = [[UIColor lightGrayColor] CGColor];
-    //    self.groupImageButton.imageView.layer.borderColor   = [[UIColor lightGrayColor] CGColor];
+    self.avatarView.layer.borderWidth = 0.5f;
-    //    self.groupImageButton.imageView.layer.borderWidth   = 0.5f;
     self.avatarView.contentMode = UIViewContentModeScaleAspectFill;
 }
 
@@ -525,16 +524,6 @@ NS_ASSUME_NONNULL_BEGIN
                              NSLocalizedString(@"NEW_GROUP_VIEW_UNSAVED_CHANGES_MESSAGE",
                                  @"The alert message if user tries to exit the new group view without saving changes.")
                   preferredStyle:UIAlertControllerStyleAlert];
-    [controller addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_SAVE",
-                                                             @"The label for the 'save' button in action sheets.")
-                                                   style:UIAlertActionStyleDefault
-                                                 handler:^(UIAlertAction *action) {
-                                                     OWSAssert(self.delegate);
-
-                                                     [self createGroup];
-
-                                                     [self.delegate popAllConversationSettingsViews];
-                                                 }]];
     [controller
         addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_DISCARD_BUTTON",
                                                      @"The label for the 'discard' button in alerts and action sheets.")

Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m

@@ -140,29 +140,6 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     [self updateTableContents];
-
-    if ([self.thread isKindOfClass:[TSGroupThread class]]) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            OWSAssert(self.delegate);
-            UpdateGroupViewController *updateGroupViewController = [UpdateGroupViewController new];
-            updateGroupViewController.delegate = self.delegate;
-            updateGroupViewController.thread = (TSGroupThread *)self.thread;
-            [self.navigationController pushViewController:updateGroupViewController animated:YES];
-        });
-    }
-}
-
-- (void)viewDidAppear:(BOOL)animated
-{
-    [super viewDidAppear:animated];
-
-    //    dispatch_async(dispatch_get_main_queue(), ^{
-    //        OWSAssert(self.delegate);
-    //        UpdateGroupViewController *updateGroupViewController = [UpdateGroupViewController new];
-    //        updateGroupViewController.delegate = self.delegate;
-    //        [updateGroupViewController configWithThread:(TSGroupThread *)self.thread];
-    //        [self.navigationController pushViewController:updateGroupViewController animated:YES];
-    //    });
 }
 
 - (void)updateTableContents

Signal/src/ViewControllers/PrivacySettingsTableViewController.m

@@ -52,11 +52,6 @@ typedef NS_ENUM(NSInteger, PrivacySettingsTableViewControllerSectionIndex) {
     [self.navigationController.navigationBar setTranslucent:NO];
 
     self.tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero];
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        BlockListViewController *vc = [[BlockListViewController alloc] init];
-        [self.navigationController pushViewController:vc animated:YES];
-    });
 }
 
 - (instancetype)init {

Signal/src/ViewControllers/SettingsTableViewController.m

@@ -105,11 +105,6 @@ typedef enum {
 
     [self.destroyAccountButton setTitle:NSLocalizedString(@"SETTINGS_DELETE_ACCOUNT_BUTTON", @"")
                                forState:UIControlStateNormal];
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        PrivacySettingsTableViewController *vc = [[PrivacySettingsTableViewController alloc] init];
-        [self.navigationController pushViewController:vc animated:YES];
-    });
 }
 
 - (void)viewWillAppear:(BOOL)animated

Signal/src/ViewControllers/SignalsViewController.m

@@ -163,15 +163,6 @@ NSString *const SignalsViewControllerSegueShowIncomingCall = @"ShowIncomingCallS
                                                object:nil];
     
     [self updateBarButtonItems];
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        //        [self settingsButtonPressed:nil];
-
-        [self performSegueWithIdentifier:@"composeNew" sender:self];
-
-        //        TSThread *thread = [self threadForIndexPath:[NSIndexPath indexPathForItem:0 inSection:0]];
-        //        [self presentThread:thread keyboardOnViewAppearing:NO callOnViewAppearing:NO];
-    });
 }
 
 - (void)updateBarButtonItems {
@@ -297,12 +288,6 @@ NSString *const SignalsViewControllerSegueShowIncomingCall = @"ShowIncomingCallS
     } else {
         [self displayAnyUnseenUpgradeExperience];
     }
-
-    //    dispatch_async(dispatch_get_main_queue(), ^{
-    //        //        [self performSegueWithIdentifier:@"composeNew" sender:self];
-    //        TSThread *thread = [self threadForIndexPath:[NSIndexPath indexPathForItem:0 inSection:0]];
-    //        [self presentThread:thread keyboardOnViewAppearing:NO callOnViewAppearing:NO];
-    //    });
 }
 
 #pragma mark - startup

Signal/src/ViewControllers/UpdateGroupViewController.m

@@ -121,12 +121,6 @@ NS_ASSUME_NONNULL_BEGIN
     [_tableViewController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:firstSection];
     [_tableViewController.view autoPinEdgeToSuperviewEdge:ALEdgeBottom];
 
-    dispatch_async(dispatch_get_main_queue(), ^{
-        AddToGroupViewController *viewController = [AddToGroupViewController new];
-        viewController.addToGroupDelegate = self;
-        [self.navigationController pushViewController:viewController animated:YES];
-    });
-
     [self updateTableContents];
 }
 
@@ -407,12 +401,8 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert(image);
 
     self.avatarView.image = image;
-    //    [self.avatarView setImage:image forState:UIControlStateNormal];
+    self.avatarView.layer.borderColor = [[UIColor lightGrayColor] CGColor];
-    //    self.groupImageButton.imageView.layer.cornerRadius  = CGRectGetWidth([self.groupImageButton.imageView frame])
+    self.avatarView.layer.borderWidth = 0.5f;
-    //    / 2.0f; self.groupImageButton.imageView.layer.masksToBounds = YES;
-    // TODO.
-    //    self.groupImageButton.imageView.layer.borderColor   = [[UIColor lightGrayColor] CGColor];
-    //    self.groupImageButton.imageView.layer.borderWidth   = 0.5f;
     self.avatarView.contentMode = UIViewContentModeScaleAspectFill;
 }