Merge branch 'master' into objcNotificationCenter

Author: thomaszurkan-optimizely

DemoObjCApp/AppDelegate.m

@@ -51,8 +51,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 -(void)initializeOptimizelySDKAsynchronous {
     self.optimizely = [[OptimizelyManager alloc] initWithSdkKey:kOptimizelySdkKey];
-    
-    [self.optimizely initializeSDKWithCompletion:^(NSError * _Nullable error, NSData * _Nullable data) {
+
+    [self.optimizely initializeSDKWithCompletion:^(NSData * _Nullable data, NSError * _Nullable error) {
         if (error == nil) {
             NSLog(@"Optimizely SDK initialized successfully!");
         } else {
@@ -111,7 +111,7 @@ -(void)startAppWithExperimentActivated {
         NSLog(@"Optimizely SDK activation failed: %@", error.localizedDescription);
         self.optimizely = nil;
     }
-                              
+
 
     [self setRootViewControllerWithOtimizelyManager:self.optimizely bucketedVariation:variationKey];
 }

DemoObjCApp/VariationViewController.m

@@ -40,6 +40,7 @@ - (IBAction)unwindToVariationAction:(UIStoryboardSegue *)segue {
 
 - (IBAction)attemptTrackAndShowSuccessOrFailure:(id)sender {
     NSError *error;
+    
     BOOL status = [self.optimizely trackWithEventKey:self.eventKey userId:self.userId attributes:nil eventTags:nil error:&error];
 
     if (status) {

DemoSwiftApp/AppDelegate.swift

@@ -67,7 +67,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                                        logger: customLogger,
                                        periodicDownloadInterval:30)
 
-        
         _ = optimizely?.notificationCenter.addDatafileChangeNotificationListener(datafileListener: { (data) in
             DispatchQueue.main.async {
             #if os(iOS)
@@ -149,7 +148,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                                                        userId: userId,
                                                        attributes: attributes)
             openVariationView(optimizelyManager: optimizely, variationKey: variationKey)
-
 // used to test threading and datafile updates.
 //
 //            DispatchQueue.global(qos: .background).async {

OptimizelySDK/Customization/DefaultEventDispatcher.swift

@@ -194,11 +194,11 @@ open class DefaultEventDispatcher : BackgroundingCallbacks, OPTEventDispatcher {
             self.logger?.log(level: .debug, message: response.debugDescription)
 
             if let error = error {
-                completionHandler(Result.failure(OPTEventDispatchError(description: error.localizedDescription)))
+                completionHandler(.failure(.eventDispatchFailed(error.localizedDescription)))
             }
             else {
                 self.logger?.log(level: .debug, message: "Event Sent")
-                completionHandler(Result.success(event.body))
+                completionHandler(.success(event.body))
             }
         }
 

OptimizelySDK/Customization/Protocols/OPTEventDispatcher.swift

@@ -16,15 +16,7 @@
 
 import Foundation
 
-public typealias DispatchCompletionHandler = (Result<Data, OPTEventDispatchError>)->(Void)
-
-public class OPTEventDispatchError : Error {
-    public var localizedDescription: String
-    
-    init(description:String) {
-        localizedDescription = description
-    }
-}
+public typealias DispatchCompletionHandler = (Result<Data, OptimizelyError>)->(Void)
 
 /**
  The OPTEventDispatcher dispatches events to the Optimizely backend used in results.

OptimizelySDK/Customization/Protocols/OPTLogger.swift

@@ -12,7 +12,7 @@ import Foundation
 /**
  * Any logger must implement these following methods.
  */
-public protocol OPTLogger {
+@objc public protocol OPTLogger {
 
     /// The log level the Logger is initialized with.
     static var logLevel: OptimizelyLogLevel { get set }

OptimizelySDK/Customization/Protocols/OPTUserProfileService.swift

@@ -79,7 +79,7 @@ struct UserProfileKeys {
     static let kUserId = "user_id"
 }
 
-public protocol OPTUserProfileService {
+@objc public protocol OPTUserProfileService {
 
     typealias UPProfile = [String: Any]   // {"experiment_bucket_map", "user_id"}
     typealias UPBucketMap = [String: UPExperimentMap]

OptimizelySDK/Data Model/DispatchEvents/EventForDispatch.swift

@@ -8,14 +8,20 @@
 
 import Foundation
 
-public class EventForDispatch : Equatable, Codable {
+@objcMembers public class EventForDispatch: NSObject, Codable {
     static let eventEndpoint = "https://logx.optimizely.com/v1/events"
 
-    public let url:URL
-    public let body:Data
-    
-    init(url: URL? = nil, body: Data) {
+    public let url: URL
+    public let body: Data
+
+    public init(url: URL? = nil, body: Data) {
         self.url = url ?? URL(string: EventForDispatch.eventEndpoint)!
         self.body = body
     }
+    
+    // override NSObject Equatable ('==' overriding not working for NSObject)
+    override public func isEqual(_ object: Any?) -> Bool {
+        guard let object = object as? EventForDispatch else { return false }
+        return url == object.url && body == object.body
+    }
 }