Merge branch 'charlesmchen/appSettingsButton'

Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m

@@ -227,30 +227,42 @@
                                               }]];
 #endif
 
-    [section addItem:[OWSTableItem itemWithCustomCellBlock:^{
+    if (TSAccountManager.sharedInstance.isDeregistered) {
+        [section addItem:[self destructiveButtonItemWithTitle:NSLocalizedString(@"SETTINGS_REREGISTER_BUTTON",
+                                                                  @"Label for re-registration button.")
+                                                     selector:@selector(reregisterUser)
+                                                        color:[UIColor ows_materialBlueColor]]];
+        [section addItem:[self destructiveButtonItemWithTitle:NSLocalizedString(@"SETTINGS_DELETE_DATA_BUTTON",
+                                                                  @"Label for 'delete data' button.")
+                                                     selector:@selector(deleteUnregisterUserData)
+                                                        color:[UIColor ows_destructiveRedColor]]];
+    } else {
+        [section addItem:[self destructiveButtonItemWithTitle:NSLocalizedString(@"SETTINGS_DELETE_ACCOUNT_BUTTON", @"")
+                                                     selector:@selector(unregisterUser)
+                                                        color:[UIColor ows_destructiveRedColor]]];
+    }
+
+    [contents addSection:section];
+
+    self.contents = contents;
+}
+
+- (OWSTableItem *)destructiveButtonItemWithTitle:(NSString *)title selector:(SEL)selector color:(UIColor *)color
+{
+    return [OWSTableItem
+        itemWithCustomCellBlock:^{
             UITableViewCell *cell = [UITableViewCell new];
             cell.preservesSuperviewLayoutMargins = YES;
             cell.contentView.preservesSuperviewLayoutMargins = YES;
             cell.selectionStyle = UITableViewCellSelectionStyleNone;
 
             const CGFloat kButtonHeight = 40.f;
-        OWSFlatButton *button;
+            OWSFlatButton *button = [OWSFlatButton buttonWithTitle:title
-        if (TSAccountManager.sharedInstance.isDeregistered) {
-            button = [OWSFlatButton
-                buttonWithTitle:NSLocalizedString(@"SETTINGS_REREGISTER_BUTTON", @"Label for re-registration button.")
-                           font:[OWSFlatButton fontForHeight:kButtonHeight]
-                     titleColor:[UIColor whiteColor]
-                backgroundColor:[UIColor ows_destructiveRedColor]
-                         target:self
-                       selector:@selector(reregisterUser)];
-        } else {
-            button = [OWSFlatButton buttonWithTitle:NSLocalizedString(@"SETTINGS_DELETE_ACCOUNT_BUTTON", @"")
                                                               font:[OWSFlatButton fontForHeight:kButtonHeight]
                                                         titleColor:[UIColor whiteColor]
-                                    backgroundColor:[UIColor ows_destructiveRedColor]
+                                                   backgroundColor:color
                                                             target:self
-                                           selector:@selector(unregisterUser)];
+                                                          selector:selector];
-        }
             [cell.contentView addSubview:button];
             [button autoSetDimension:ALDimensionHeight toSize:kButtonHeight];
             [button autoVCenterInSuperview];
@@ -259,11 +271,7 @@
             return cell;
         }
                 customRowHeight:90.f
-                                               actionBlock:nil]];
+                    actionBlock:nil];
-
-    [contents addSection:section];
-
-    self.contents = contents;
 }
 
 - (UITableViewCell *)profileHeaderCell
@@ -411,6 +419,16 @@
 #pragma mark - Unregister & Re-register
 
 - (void)unregisterUser
+{
+    [self showDeleteAccountUI:YES];
+}
+
+- (void)deleteUnregisterUserData
+{
+    [self showDeleteAccountUI:NO];
+}
+
+- (void)showDeleteAccountUI:(BOOL)isRegistered
 {
     UIAlertController *alertController =
         [UIAlertController alertControllerWithTitle:NSLocalizedString(@"CONFIRM_ACCOUNT_DESTRUCTION_TITLE", @"")
@@ -419,30 +437,36 @@
     [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"PROCEED_BUTTON", @"")
                                                         style:UIAlertActionStyleDestructive
                                                       handler:^(UIAlertAction *action) {
-                                                          [self proceedToUnregistration];
+                                                          [self deleteAccount:isRegistered];
                                                       }]];
     [alertController addAction:[OWSAlerts cancelAction]];
 
     [self presentViewController:alertController animated:YES completion:nil];
 }
 
-- (void)proceedToUnregistration
+- (void)deleteAccount:(BOOL)isRegistered
 {
+    if (isRegistered) {
         [ModalActivityIndicatorViewController
             presentFromViewController:self
                             canCancel:NO
                       backgroundBlock:^(ModalActivityIndicatorViewController *modalActivityIndicator) {
-                      [TSAccountManager unregisterTextSecureWithSuccess:^{
+                          [TSAccountManager
+                              unregisterTextSecureWithSuccess:^{
                                   [SignalApp resetAppData];
                               }
                               failure:^(NSError *error) {
                                   dispatch_async(dispatch_get_main_queue(), ^{
                                       [modalActivityIndicator dismissWithCompletion:^{
-                                      [OWSAlerts showAlertWithTitle:NSLocalizedString(@"UNREGISTER_SIGNAL_FAIL", @"")];
+                                          [OWSAlerts
+                                              showAlertWithTitle:NSLocalizedString(@"UNREGISTER_SIGNAL_FAIL", @"")];
                                       }];
                                   });
                               }];
                       }];
+    } else {
+        [SignalApp resetAppData];
+    }
 }
 
 - (void)reregisterUser

Signal/translations/en.lproj/Localizable.strings

@@ -1933,6 +1933,9 @@
 /* No comment provided by engineer. */
 "SETTINGS_DELETE_ACCOUNT_BUTTON" = "Delete Account";
 
+/* Label for 'delete data' button. */
+"SETTINGS_DELETE_DATA_BUTTON" = "Delete All Data";
+
 /* Alert message before user confirms clearing history */
 "SETTINGS_DELETE_HISTORYLOG_CONFIRMATION" = "Are you sure you want to delete all your history (messages, attachments, call history …) ? This action cannot be reverted.";