keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Migrate to Swift 4.

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent 28e26e1f75
commit da5ae63bbc
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

16
Signal/src/util/OWSBackupAPI.swift
Unescape Escape View File

@ -80,7 +80,7 @@ import CloudKit
// backups can reuse the same record. // backups can reuse the same record.
@objc @objc
public class func savePersistentFileOnceToCloud(fileId: String, public class func savePersistentFileOnceToCloud(fileId: String,
fileUrlBlock: @escaping (()) -> URL?, fileUrlBlock: @escaping () -> URL?,
success: @escaping (String) -> Void, success: @escaping (String) -> Void,
failure: @escaping (Error) -> Void) { failure: @escaping (Error) -> Void) {
saveFileOnceToCloud(recordName: recordNameForPersistentFile(fileId: fileId), saveFileOnceToCloud(recordName: recordNameForPersistentFile(fileId: fileId),
@ -208,7 +208,7 @@ import CloudKit
@objc @objc
public class func saveFileOnceToCloud(recordName: String, public class func saveFileOnceToCloud(recordName: String,
recordType: String, recordType: String,
fileUrlBlock: @escaping (()) -> URL?, fileUrlBlock: @escaping () -> URL?,
success: @escaping (String) -> Void, success: @escaping (String) -> Void,
failure: @escaping (Error) -> Void) { failure: @escaping (Error) -> Void) {
@ -220,7 +220,7 @@ import CloudKit
success(recordName) success(recordName)
} else { } else {
// No record found, saving new record. // No record found, saving new record.
guard let fileUrl = fileUrlBlock(()) else { guard let fileUrl = fileUrlBlock() else {
Logger.error("\(self.logTag) error preparing file for upload.") Logger.error("\(self.logTag) error preparing file for upload.")
failure(OWSErrorWithCodeDescription(.exportBackupError, failure(OWSErrorWithCodeDescription(.exportBackupError,
NSLocalizedString("BACKUP_EXPORT_ERROR_SAVE_FILE_TO_CLOUD_FAILED", NSLocalizedString("BACKUP_EXPORT_ERROR_SAVE_FILE_TO_CLOUD_FAILED",
@ -242,7 +242,7 @@ import CloudKit
@objc @objc
public class func deleteRecordsFromCloud(recordNames: [String], public class func deleteRecordsFromCloud(recordNames: [String],
success: @escaping (()) -> Void, success: @escaping () -> Void,
failure: @escaping (Error) -> Void) { failure: @escaping (Error) -> Void) {
deleteRecordsFromCloud(recordNames: recordNames, deleteRecordsFromCloud(recordNames: recordNames,
remainingRetries: maxRetries, remainingRetries: maxRetries,
@ -252,7 +252,7 @@ import CloudKit
private class func deleteRecordsFromCloud(recordNames: [String], private class func deleteRecordsFromCloud(recordNames: [String],
remainingRetries: Int, remainingRetries: Int,
success: @escaping (()) -> Void, success: @escaping () -> Void,
failure: @escaping (Error) -> Void) { failure: @escaping (Error) -> Void) {
let recordIDs = recordNames.map { CKRecordID(recordName: $0) } let recordIDs = recordNames.map { CKRecordID(recordName: $0) }
@ -264,7 +264,7 @@ import CloudKit
label: "Delete Records") label: "Delete Records")
switch outcome { switch outcome {
case .success: case .success:
success(()) success()
case .failureDoNotRetry(let outcomeError): case .failureDoNotRetry(let outcomeError):
failure(outcomeError) failure(outcomeError)
case .failureRetryAfterDelay(let retryDelay): case .failureRetryAfterDelay(let retryDelay):
@ -466,7 +466,7 @@ import CloudKit
@objc @objc
public class func downloadFileFromCloud(recordName: String, public class func downloadFileFromCloud(recordName: String,
toFileUrl: URL, toFileUrl: URL,
success: @escaping (()) -> Void, success: @escaping () -> Void,
failure: @escaping (Error) -> Void) { failure: @escaping (Error) -> Void) {
downloadFromCloud(recordName: recordName, downloadFromCloud(recordName: recordName,
@ -475,7 +475,7 @@ import CloudKit
DispatchQueue.global().async { DispatchQueue.global().async {
do { do {
try FileManager.default.copyItem(at: asset.fileURL, to: toFileUrl) try FileManager.default.copyItem(at: asset.fileURL, to: toFileUrl)
success(()) success()
} catch { } catch {
Logger.error("\(self.logTag) couldn't copy asset file: \(error).") Logger.error("\(self.logTag) couldn't copy asset file: \(error).")
failure(invalidServiceResponseError()) failure(invalidServiceResponseError())

6
Signal/src/util/TextFieldHelper.swift
Unescape Escape View File

@ -1,5 +1,5 @@
// //
// Copyright (c) 2017 Open Whisper Systems. All rights reserved. // Copyright (c) 2018 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation
@ -38,7 +38,7 @@ import UIKit
var acceptableSubstring = "" var acceptableSubstring = ""
for (_, char) in replacementString.characters.enumerated() { for (_, char) in replacementString.enumerated() {
var maybeAcceptableSubstring = acceptableSubstring var maybeAcceptableSubstring = acceptableSubstring
maybeAcceptableSubstring.append(char) maybeAcceptableSubstring.append(char)
if (byteLength(maybeAcceptableSubstring) <= availableSpace) { if (byteLength(maybeAcceptableSubstring) <= availableSpace) {
@ -48,7 +48,7 @@ import UIKit
} }
} }
textField.text = (existingString as NSString).replacingCharacters(in: editingRange, with:acceptableSubstring) textField.text = (existingString as NSString).replacingCharacters(in: editingRange, with: acceptableSubstring)
// We've already handled any valid editing manually, so prevent further changes. // We've already handled any valid editing manually, so prevent further changes.
return false return false

4
SignalMessaging/environment/migrations/OWS106EnsureProfileComplete.swift
Unescape Escape View File

@ -20,7 +20,7 @@ public class OWS106EnsureProfileComplete: OWSDatabaseMigration {
// Overriding runUp since we have some specific completion criteria which // Overriding runUp since we have some specific completion criteria which
// is more likely to fail since it involves network requests. // is more likely to fail since it involves network requests.
override public func runUp(completion:@escaping ((Void)) -> Void) { override public func runUp(completion:@escaping () -> Void) {
let job = CompleteRegistrationFixerJob(completionHandler: { (didSucceed) in let job = CompleteRegistrationFixerJob(completionHandler: { (didSucceed) in
if (didSucceed) { if (didSucceed) {
@ -30,7 +30,7 @@ public class OWS106EnsureProfileComplete: OWSDatabaseMigration {
Logger.error("\(self.TAG) Failed.") Logger.error("\(self.TAG) Failed.")
} }
completion(()) completion()
}) })
type(of: self).sharedCompleteRegistrationFixerJob = job type(of: self).sharedCompleteRegistrationFixerJob = job

Write Preview
Loading…
Cancel
Save