Respond to CR.

Signal/src/ViewControllers/CallViewController.swift

@@ -1022,7 +1022,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver,
         updateRemoteVideoLayout()
     }
 
-    internal func dismissIfPossible(shouldDelay: Bool, ignoreNag ignoreNagParam: Bool = false, completion: (() -> Swift.Void)? = nil) {
+    internal func dismissIfPossible(shouldDelay: Bool, ignoreNag ignoreNagParam: Bool = false, completion: (() -> Void)? = nil) {
         callUIAdapter.audioService.delegate = nil
 
         let ignoreNag: Bool = {

Signal/src/network/GiphyDownloader.swift

@@ -783,7 +783,7 @@ extension URLSessionTask {
         assetSegment.append(data: data)
     }
 
-    public func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, willCacheResponse proposedResponse: CachedURLResponse, completionHandler: @escaping (CachedURLResponse?) -> Swift.Void) {
+    public func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, willCacheResponse proposedResponse: CachedURLResponse, completionHandler: @escaping (CachedURLResponse?) -> Void) {
         completionHandler(nil)
     }
 

Signal/src/util/OWSBackup.m

@@ -364,6 +364,7 @@ NS_ASSUME_NONNULL_BEGIN
 
         [self ensureBackupExportState];
     } else {
+        DDLogWarn(@"%@ obsolete job succeeded: %@", self.logTag, [backupJob class]);
         return;
     }
 
@@ -387,7 +388,7 @@ NS_ASSUME_NONNULL_BEGIN
 
         [self ensureBackupExportState];
     } else {
-        DDLogInfo(@"%@ stale backup job failed.", self.logTag);
+        DDLogInfo(@"%@ obsolete backup job failed.", self.logTag);
         return;
     }
 

Signal/src/util/OWSBackupAPI.swift

@@ -21,8 +21,8 @@ import CloudKit
 
     @objc
     public class func saveTestFileToCloud(fileUrl: URL,
-                                          success: @escaping (String) -> Swift.Void,
-                                          failure: @escaping (Error) -> Swift.Void) {
+                                          success: @escaping (String) -> Void,
+                                          failure: @escaping (Error) -> Void) {
         saveFileToCloud(fileUrl: fileUrl,
                         recordName: NSUUID().uuidString,
                         recordType: signalBackupRecordType,
@@ -36,8 +36,8 @@ import CloudKit
     // complete.
     @objc
     public class func saveEphemeralDatabaseFileToCloud(fileUrl: URL,
-                                                       success: @escaping (String) -> Swift.Void,
-                                                       failure: @escaping (Error) -> Swift.Void) {
+                                                       success: @escaping (String) -> Void,
+                                                       failure: @escaping (Error) -> Void) {
         saveFileToCloud(fileUrl: fileUrl,
                         recordName: "ephemeralFile-\(NSUUID().uuidString)",
                         recordType: signalBackupRecordType,
@@ -50,9 +50,9 @@ import CloudKit
     // backups can reuse the same record.
     @objc
     public class func savePersistentFileOnceToCloud(fileId: String,
-                                                    fileUrlBlock: @escaping (Swift.Void) -> URL?,
-                                                    success: @escaping (String) -> Swift.Void,
-                                                    failure: @escaping (Error) -> Swift.Void) {
+                                                    fileUrlBlock: @escaping (()) -> URL?,
+                                                    success: @escaping (String) -> Void,
+                                                    failure: @escaping (Error) -> Void) {
         saveFileOnceToCloud(recordName: "persistentFile-\(fileId)",
             recordType: signalBackupRecordType,
             fileUrlBlock: fileUrlBlock,
@@ -62,8 +62,8 @@ import CloudKit
 
     @objc
     public class func upsertManifestFileToCloud(fileUrl: URL,
-                                                success: @escaping (String) -> Swift.Void,
-                                                failure: @escaping (Error) -> Swift.Void) {
+                                                success: @escaping (String) -> Void,
+                                                failure: @escaping (Error) -> Void) {
         // We want to use a well-known record id and type for manifest files.
         upsertFileToCloud(fileUrl: fileUrl,
                           recordName: manifestRecordName,
@@ -76,8 +76,8 @@ import CloudKit
     public class func saveFileToCloud(fileUrl: URL,
                                       recordName: String,
                                       recordType: String,
-                                      success: @escaping (String) -> Swift.Void,
-                                      failure: @escaping (Error) -> Swift.Void) {
+                                      success: @escaping (String) -> Void,
+                                      failure: @escaping (Error) -> Void) {
         let recordID = CKRecordID(recordName: recordName)
         let record = CKRecord(recordType: recordType, recordID: recordID)
         let asset = CKAsset(fileURL: fileUrl)
@@ -90,8 +90,8 @@ import CloudKit
 
     @objc
     public class func saveRecordToCloud(record: CKRecord,
-                                        success: @escaping (String) -> Swift.Void,
-                                        failure: @escaping (Error) -> Swift.Void) {
+                                        success: @escaping (String) -> Void,
+                                        failure: @escaping (Error) -> Void) {
 
         let myContainer = CKContainer.default()
         let privateDatabase = myContainer.privateCloudDatabase
@@ -117,8 +117,8 @@ import CloudKit
 
     @objc
     public class func deleteRecordFromCloud(recordName: String,
-                                            success: @escaping (Swift.Void) -> Swift.Void,
-                                            failure: @escaping (Error) -> Swift.Void) {
+                                            success: @escaping (()) -> Void,
+                                            failure: @escaping (Error) -> Void) {
 
         let recordID = CKRecordID(recordName: recordName)
 
@@ -146,8 +146,8 @@ import CloudKit
     public class func upsertFileToCloud(fileUrl: URL,
                                         recordName: String,
                                         recordType: String,
-                                        success: @escaping (String) -> Swift.Void,
-                                        failure: @escaping (Error) -> Swift.Void) {
+                                        success: @escaping (String) -> Void,
+                                        failure: @escaping (Error) -> Void) {
 
         checkForFileInCloud(recordName: recordName,
                             success: { (record) in
@@ -178,9 +178,9 @@ import CloudKit
     @objc
     public class func saveFileOnceToCloud(recordName: String,
                                           recordType: String,
-                                          fileUrlBlock: @escaping (Swift.Void) -> URL?,
-                                          success: @escaping (String) -> Swift.Void,
-                                          failure: @escaping (Error) -> Swift.Void) {
+                                          fileUrlBlock: @escaping (()) -> URL?,
+                                          success: @escaping (String) -> Void,
+                                          failure: @escaping (Error) -> Void) {
 
         checkForFileInCloud(recordName: recordName,
                             success: { (record) in
@@ -208,8 +208,8 @@ import CloudKit
     }
 
     private class func checkForFileInCloud(recordName: String,
-                                          success: @escaping (CKRecord?) -> Swift.Void,
-                                          failure: @escaping (Error) -> Swift.Void) {
+                                          success: @escaping (CKRecord?) -> Void,
+                                          failure: @escaping (Error) -> Void) {
         let recordId = CKRecordID(recordName: recordName)
         let fetchOperation = CKFetchRecordsOperation(recordIDs: [recordId ])
         // Don't download the file; we're just using the fetch to check whether or
@@ -246,8 +246,8 @@ import CloudKit
     }
 
     @objc
-    public class func checkForManifestInCloud(success: @escaping (Bool) -> Swift.Void,
-                                              failure: @escaping (Error) -> Swift.Void) {
+    public class func checkForManifestInCloud(success: @escaping (Bool) -> Void,
+                                              failure: @escaping (Error) -> Void) {
 
         checkForFileInCloud(recordName: manifestRecordName,
                             success: { (record) in
@@ -257,8 +257,8 @@ import CloudKit
     }
 
     @objc
-    public class func fetchAllRecordNames(success: @escaping ([String]) -> Swift.Void,
-                                          failure: @escaping (Error) -> Swift.Void) {
+    public class func fetchAllRecordNames(success: @escaping ([String]) -> Void,
+                                          failure: @escaping (Error) -> Void) {
 
         let query = CKQuery(recordType: signalBackupRecordType, predicate: NSPredicate(value: true))
         // Fetch the first page of results for this query.
@@ -272,8 +272,8 @@ import CloudKit
     private class func fetchAllRecordNamesStep(query: CKQuery,
                                                previousRecordNames: [String],
                                                cursor: CKQueryCursor?,
-                                               success: @escaping ([String]) -> Swift.Void,
-                                               failure: @escaping (Error) -> Swift.Void) {
+                                               success: @escaping ([String]) -> Void,
+                                               failure: @escaping (Error) -> Void) {
 
         var allRecordNames = previousRecordNames
 
@@ -314,8 +314,8 @@ import CloudKit
 
     @objc
     public class func downloadManifestFromCloud(
-                                            success: @escaping (Data) -> Swift.Void,
-                                            failure: @escaping (Error) -> Swift.Void) {
+                                            success: @escaping (Data) -> Void,
+                                            failure: @escaping (Error) -> Void) {
         downloadDataFromCloud(recordName: manifestRecordName,
                                             success: success,
                                             failure: failure)
@@ -323,8 +323,8 @@ import CloudKit
 
     @objc
     public class func downloadDataFromCloud(recordName: String,
-                                            success: @escaping (Data) -> Swift.Void,
-                                            failure: @escaping (Error) -> Swift.Void) {
+                                            success: @escaping (Data) -> Void,
+                                            failure: @escaping (Error) -> Void) {
 
         downloadFromCloud(recordName: recordName,
                           success: { (asset) in
@@ -346,8 +346,8 @@ import CloudKit
     @objc
     public class func downloadFileFromCloud(recordName: String,
                                             toFileUrl: URL,
-                                            success: @escaping (Swift.Void) -> Swift.Void,
-                                            failure: @escaping (Error) -> Swift.Void) {
+                                            success: @escaping (()) -> Void,
+                                            failure: @escaping (Error) -> Void) {
 
         downloadFromCloud(recordName: recordName,
                           success: { (asset) in
@@ -367,8 +367,8 @@ import CloudKit
     }
 
     private class func downloadFromCloud(recordName: String,
-                                            success: @escaping (CKAsset) -> Swift.Void,
-                                            failure: @escaping (Error) -> Swift.Void) {
+                                            success: @escaping (CKAsset) -> Void,
+                                            failure: @escaping (Error) -> Void) {
 
         let recordId = CKRecordID(recordName: recordName)
         let fetchOperation = CKFetchRecordsOperation(recordIDs: [recordId ])
@@ -400,7 +400,7 @@ import CloudKit
     }
 
     @objc
-    public class func checkCloudKitAccess(completion: @escaping (Bool) -> Swift.Void) {
+    public class func checkCloudKitAccess(completion: @escaping (Bool) -> Void) {
         CKContainer.default().accountStatus(completionHandler: { (accountStatus, error) in
             DispatchQueue.main.async {
                 switch accountStatus {

Signal/src/util/Pastelog.m

@@ -389,7 +389,6 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
         [tempDirectory stringByAppendingPathComponent:[logsName stringByAppendingPathExtension:@"zip"]];
     NSString *zipDirPath = [tempDirectory stringByAppendingPathComponent:logsName];
     [OWSFileSystem ensureDirectoryExists:zipDirPath];
-    [OWSFileSystem protectFileOrFolderAtPath:zipDirPath];
 
     NSArray<NSString *> *logFilePaths = DebugLogger.sharedLogger.allLogFilePaths;
     if (logFilePaths.count < 1) {

Signal/test/Models/AccountManagerTest.swift

@@ -42,7 +42,7 @@ class VerifyingTSAccountManager: FailingTSAccountManager {
         success()
     }
 
-    override func registerForManualMessageFetching(success successBlock: @escaping () -> Swift.Void, failure failureBlock: @escaping (Error) -> Swift.Void) {
+    override func registerForManualMessageFetching(success successBlock: @escaping () -> Void, failure failureBlock: @escaping (Error) -> Void) {
         successBlock()
     }
 }

SignalMessaging/profiles/OWSProfileManager.m

@@ -1124,8 +1124,6 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
         profileAvatarsDirPath = OWSProfileManager.sharedDataProfileAvatarsDirPath;
         
         [OWSFileSystem ensureDirectoryExists:profileAvatarsDirPath];
-
-        [OWSFileSystem protectFileOrFolderAtPath:profileAvatarsDirPath];
     });
     return profileAvatarsDirPath;
 }

SignalMessaging/utils/DebugLogger.m

@@ -39,7 +39,6 @@ const NSUInteger kMaxDebugLogFileSize = 1024 * 1024 * 3;
 {
     NSString *dirPath = [[OWSFileSystem cachesDirectoryPath] stringByAppendingPathComponent:@"Logs"];
     [OWSFileSystem ensureDirectoryExists:dirPath];
-    [OWSFileSystem protectFileOrFolderAtPath:dirPath];
     return dirPath;
 }
 
@@ -48,7 +47,6 @@ const NSUInteger kMaxDebugLogFileSize = 1024 * 1024 * 3;
     NSString *dirPath =
         [[OWSFileSystem appSharedDataDirectoryPath] stringByAppendingPathComponent:@"ShareExtensionLogs"];
     [OWSFileSystem ensureDirectoryExists:dirPath];
-    [OWSFileSystem protectFileOrFolderAtPath:dirPath];
     return dirPath;
 }
 

SignalMessaging/views/OWSAlerts.swift

@@ -55,7 +55,7 @@ import Foundation
     }
 
     @objc
-    public class func showErrorAlert(message message: String) {
+    public class func showErrorAlert(message: String) {
         self.showAlert(title: CommonStrings.errorAlertTitle, message: message, buttonTitle: nil)
     }
 

SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m

@@ -210,8 +210,6 @@ NS_ASSUME_NONNULL_BEGIN
         attachmentsFolder = TSAttachmentStream.sharedDataAttachmentsDirPath;
 
         [OWSFileSystem ensureDirectoryExists:attachmentsFolder];
-
-        [OWSFileSystem protectFileOrFolderAtPath:attachmentsFolder];
     });
     return attachmentsFolder;
 }

SignalServiceKit/src/Storage/OWSBackupStorage.h

@@ -21,8 +21,6 @@ typedef NSData *_Nullable (^BackupStorageKeySpecBlock)(void);
 - (instancetype)initBackupStorageWithDatabaseDirPath:(NSString *)databaseDirPath
                                         keySpecBlock:(BackupStorageKeySpecBlock)keySpecBlock NS_DESIGNATED_INITIALIZER;
 
-- (YapDatabaseConnection *)dbConnection;
-
 - (void)runSyncRegistrations;
 - (void)runAsyncRegistrationsWithCompletion:(void (^_Nonnull)(void))completion;
 - (BOOL)areAllRegistrationsComplete;

SignalServiceKit/src/Util/OWSFileSystem.m

@@ -210,7 +210,7 @@ NS_ASSUME_NONNULL_BEGIN
     if (exists) {
         OWSAssert(isDirectory);
 
-        return YES;
+        return [self protectFileOrFolderAtPath:dirPath];
     } else {
         DDLogInfo(@"%@ Creating directory at: %@", self.logTag, dirPath);
 
@@ -223,7 +223,7 @@ NS_ASSUME_NONNULL_BEGIN
             OWSFail(@"%@ Failed to create directory: %@, error: %@", self.logTag, dirPath, error);
             return NO;
         }
-        return YES;
+        return [self protectFileOrFolderAtPath:dirPath];
     }
 }