Skip to content

Commit 9b09f9c

Browse files
committed
cleanup NSError conversion for ObjC
1 parent c31df22 commit 9b09f9c

File tree

2 files changed

+12
-20
lines changed

2 files changed

+12
-20
lines changed

OptimizelySDK/Optimizely/OptimizelyClient+ObjC.swift

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ extension OptimizelyClient {
7070
start { result in
7171
switch result {
7272
case .failure(let error):
73-
completion?(nil, self.convertErrorForObjc(error))
73+
completion?(nil, error as NSError)
7474
case .success(let data):
7575
completion?(data, nil)
7676
}
@@ -347,25 +347,6 @@ extension OptimizelyClient {
347347
}
348348
}
349349

350-
/// Conver Swift Error for Objective-C interfaces
351-
///
352-
/// - Parameter error: Swift Error
353-
/// - Returns: Objective-C NSError converted
354-
func convertErrorForObjc(_ error: Error) -> NSError {
355-
var errorInObjc: NSError
356-
357-
// TODO: [Jae] add more details for error types
358-
359-
switch error {
360-
default:
361-
errorInObjc = NSError(domain: "com.optimizely.OptimizelySwiftSDK",
362-
code: 1000,
363-
userInfo: [NSLocalizedDescriptionKey: error.localizedDescription])
364-
}
365-
366-
return errorInObjc
367-
}
368-
369350
@available(swift, obsoleted: 1.0)
370351
@objc(notificationCenter)
371352
/// NotificationCenter for Objective-C interface support

OptimizelySDK/Optimizely/OptimizelyError.swift

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ public enum OptimizelyError: Error {
7575
case eventDispatchFailed(_ reason: String)
7676
}
7777

78+
// MARK: - CustomStringConvertible
79+
7880
extension OptimizelyError: CustomStringConvertible {
7981
public var description: String {
8082
return "[Optimizely][Error] " + self.reason
@@ -135,3 +137,12 @@ extension OptimizelyError: CustomStringConvertible {
135137
return message
136138
}
137139
}
140+
141+
// MARK: - LocalizedError (ObjC NSError)
142+
143+
extension OptimizelyError: LocalizedError {
144+
public var errorDescription: String? {
145+
return self.reason
146+
}
147+
}
148+

0 commit comments

Comments
 (0)