From acc202031c9a9a8db1b81a615e70dc4e64a62b54 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Fri, 26 Feb 2021 15:25:10 -0600 Subject: [PATCH] Renames ALTLocalizedError.errorFailure to failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Better matches LocalizedError’s failureReason, recoverySuggestion, and helpAnchor naming. --- AltBackup/BackupController.swift | 6 +++--- AltStore/Extensions/NSError+AltStore.swift | 4 ++-- AltStore/Operations/VerifyAppOperation.swift | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AltBackup/BackupController.swift b/AltBackup/BackupController.swift index 4b2379ac..93435e9c 100644 --- a/AltBackup/BackupController.swift +++ b/AltBackup/BackupController.swift @@ -38,7 +38,7 @@ struct BackupError: ALTLocalizedError let sourceFile: String let sourceFileLine: Int - var errorFailure: String? + var failure: String? var failureReason: String? { switch self.code @@ -60,7 +60,7 @@ struct BackupError: ALTLocalizedError var errorUserInfo: [String : Any] { let userInfo: [String: Any?] = [NSLocalizedDescriptionKey: self.errorDescription, NSLocalizedFailureReasonErrorKey: self.failureReason, - NSLocalizedFailureErrorKey: self.errorFailure, + NSLocalizedFailureErrorKey: self.failure, ErrorUserInfoKey.sourceFile: self.sourceFile, ErrorUserInfoKey.sourceFileLine: self.sourceFileLine] return userInfo.compactMapValues { $0 } @@ -69,7 +69,7 @@ struct BackupError: ALTLocalizedError init(_ code: Code, description: String? = nil, file: String = #file, line: Int = #line) { self.code = code - self.errorFailure = description + self.failure = description self.sourceFile = file self.sourceFileLine = line } diff --git a/AltStore/Extensions/NSError+AltStore.swift b/AltStore/Extensions/NSError+AltStore.swift index 847d5a87..ccb01b7e 100644 --- a/AltStore/Extensions/NSError+AltStore.swift +++ b/AltStore/Extensions/NSError+AltStore.swift @@ -46,7 +46,7 @@ extension NSError protocol ALTLocalizedError: LocalizedError, CustomNSError { - var errorFailure: String? { get } + var failure: String? { get } } extension ALTLocalizedError @@ -54,7 +54,7 @@ extension ALTLocalizedError var errorUserInfo: [String : Any] { let userInfo = [NSLocalizedDescriptionKey: self.errorDescription, NSLocalizedFailureReasonErrorKey: self.failureReason, - NSLocalizedFailureErrorKey: self.errorFailure].compactMapValues { $0 } + NSLocalizedFailureErrorKey: self.failure].compactMapValues { $0 } return userInfo } } diff --git a/AltStore/Operations/VerifyAppOperation.swift b/AltStore/Operations/VerifyAppOperation.swift index 701adfef..f451db2d 100644 --- a/AltStore/Operations/VerifyAppOperation.swift +++ b/AltStore/Operations/VerifyAppOperation.swift @@ -24,7 +24,7 @@ enum VerificationError: ALTLocalizedError } } - var errorFailure: String? { + var failure: String? { return String(format: NSLocalizedString("“%@” could not be installed.", comment: ""), app.name) }