From 5dcf4b3bbc4efb94b72df76dee38573c0fbc7dd9 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 18 Dec 2017 21:07:54 -0500
Subject: [PATCH] Clean up ahead of PR.

---
 .../PrivacySettingsTableViewController.m            | 13 ++++++++++++-
 SignalMessaging/utils/OWSPreferences.m              |  2 +-
 .../src/Messages/Attachments/TSAttachmentStream.m   | 11 +++--------
 SignalServiceKit/src/Storage/TSStorageManager.h     |  2 --
 SignalServiceKit/src/Storage/TSStorageManager.m     | 10 ----------
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/Signal/src/ViewControllers/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/PrivacySettingsTableViewController.m
index c27491fa28..9f16f7a1e8 100644
--- a/Signal/src/ViewControllers/PrivacySettingsTableViewController.m
+++ b/Signal/src/ViewControllers/PrivacySettingsTableViewController.m
@@ -134,13 +134,24 @@ NS_ASSUME_NONNULL_BEGIN
         [UIAlertAction actionWithTitle:NSLocalizedString(@"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON", @"")
                                  style:UIAlertActionStyleDestructive
                                handler:^(UIAlertAction *_Nonnull action) {
-                                   [[TSStorageManager sharedManager] deleteThreadsAndMessages];
+                                   [self deleteThreadsAndMessages];
                                }];
     [alertController addAction:deleteAction];
 
     [self presentViewController:alertController animated:true completion:nil];
 }
 
+- (void)deleteThreadsAndMessages
+{
+    [TSStorageManager.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+        [transaction removeAllObjectsInCollection:[TSThread collection]];
+        [transaction removeAllObjectsInCollection:[SignalRecipient collection]];
+        [transaction removeAllObjectsInCollection:[TSInteraction collection]];
+        [transaction removeAllObjectsInCollection:[TSAttachment collection]];
+    }];
+    [TSAttachmentStream deleteAttachments];
+}
+
 - (void)didToggleScreenSecuritySwitch:(UISwitch *)sender
 {
     BOOL enabled = sender.isOn;
diff --git a/SignalMessaging/utils/OWSPreferences.m b/SignalMessaging/utils/OWSPreferences.m
index 31283ae159..61f4c384a6 100644
--- a/SignalMessaging/utils/OWSPreferences.m
+++ b/SignalMessaging/utils/OWSPreferences.m
@@ -23,7 +23,7 @@ NSString *const OWSPreferencesKeyCallKitPrivacyEnabled = @"CallKitPrivacyEnabled
 NSString *const OWSPreferencesKeyCallsHideIPAddress = @"CallsHideIPAddress";
 NSString *const OWSPreferencesKeyHasDeclinedNoContactsView = @"hasDeclinedNoContactsView";
 NSString *const OWSPreferencesKeyIOSUpgradeNagVersion = @"iOSUpgradeNagVersion";
-NSString *const OWSPreferencesKey_IsReadyForAppExtensions = @"isReadyForAppExtensions";
+NSString *const OWSPreferencesKey_IsReadyForAppExtensions = @"isReadyForAppExtensions2";
 NSString *const OWSPreferencesKey_IsRegistered = @"OWSPreferencesKey_IsRegistered";
 
 @implementation OWSPreferences
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
index 27912cfb73..ce571aa2af 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
@@ -305,7 +305,6 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)deleteAttachments
 {
     NSError *error;
-
     NSFileManager *fileManager = [NSFileManager defaultManager];
 
     NSURL *fileURL = [NSURL fileURLWithPath:self.attachmentsFolder];
@@ -318,15 +317,11 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     for (NSURL *url in contents) {
-        NSError *deletionError;
-        [fileManager removeItemAtURL:url error:&deletionError];
-        if (deletionError) {
-            OWSFail(@"failed to remove item at path: %@ with error: %@", url, deletionError);
-            // continue to try to delete remaining items.
+        [fileManager removeItemAtURL:url error:&error];
+        if (error) {
+            OWSFail(@"failed to remove item at path: %@ with error: %@", url, error);
         }
     }
-
-    return;
 }
 
 - (CGSize)calculateImageSize
diff --git a/SignalServiceKit/src/Storage/TSStorageManager.h b/SignalServiceKit/src/Storage/TSStorageManager.h
index 38746d6680..81a567d31a 100644
--- a/SignalServiceKit/src/Storage/TSStorageManager.h
+++ b/SignalServiceKit/src/Storage/TSStorageManager.h
@@ -28,8 +28,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)setupDatabaseWithSafeBlockingMigrations:(void (^_Nonnull)(void))safeBlockingMigrationsBlock;
 
-- (void)deleteThreadsAndMessages;
-
 // TODO: Deprecate.
 + (YapDatabaseConnection *)dbReadConnection;
 + (YapDatabaseConnection *)dbReadWriteConnection;
diff --git a/SignalServiceKit/src/Storage/TSStorageManager.m b/SignalServiceKit/src/Storage/TSStorageManager.m
index 3e4fab5fc7..3107354540 100644
--- a/SignalServiceKit/src/Storage/TSStorageManager.m
+++ b/SignalServiceKit/src/Storage/TSStorageManager.m
@@ -201,16 +201,6 @@ NSString *const TSStorageManagerExceptionName_CouldNotCreateDatabaseDirectory
     return TSStorageManager.sharedManager.dbReadWriteConnection;
 }
 
-- (void)deleteThreadsAndMessages {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-        [transaction removeAllObjectsInCollection:[TSThread collection]];
-        [transaction removeAllObjectsInCollection:[SignalRecipient collection]];
-        [transaction removeAllObjectsInCollection:[TSInteraction collection]];
-        [transaction removeAllObjectsInCollection:[TSAttachment collection]];
-    }];
-    [TSAttachmentStream deleteAttachments];
-}
-
 - (void)deleteDatabaseFile
 {
     NSError *error;