fix conflicts

Author: jaeopt

DemoObjCApp/AppDelegate.m

@@ -17,86 +17,84 @@
 #import "AppDelegate.h"
 #import "VariationViewController.h"
 #import "FailureViewController.h"
+#import "CustomLogger.h"
 
 @import Optimizely;
 #if TARGET_OS_IOS
-    @import Amplitude_iOS;
+@import Amplitude_iOS;
 #endif
 
+
+static NSString * const kOptimizelySdkKey = @"FCnSegiEkRry9rhVMroit4";
 static NSString * const kOptimizelyDatafileName = @"demoTestDatafile";
 static NSString * const kOptimizelyExperimentKey = @"background_experiment";
 static NSString * const kOptimizelyEventKey = @"sample_conversion";
-static NSString * const kOptimizelySdkKey = @"AqLkkcss3wRGUbftnKNgh2";
 
 @interface AppDelegate ()
 @property(nonnull, strong, nonatomic) NSString *userId;
 @property(nonnull, strong, nonatomic) NSDictionary *attributes;
-@property(nullable, strong, nonatomic) OptimizelyManager *optimizely;
+@property(nullable, strong, nonatomic) OptimizelyClient *optimizely;
 @end
 
 @implementation AppDelegate
 
-
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
-    self.userId = [NSString stringWithFormat:@"%d", arc4random_uniform(300000)];
-    self.attributes = @{ @"browser_type": @"safari" };
+    // most of the third-party integrations only support iOS, so the sample code is only targeted for iOS builds
+    #if TARGET_OS_IOS
 
+    #endif
 
+    self.userId = [NSString stringWithFormat:@"%d", arc4random_uniform(300000)];
+    self.attributes = @{ @"browser_type": @"safari" };
+
     // initialize SDK in one of these two ways:
     // (1) asynchronous SDK initialization (RECOMMENDED)
     //     - fetch a JSON datafile from the server
     //     - network delay, but the local configuration is in sync with the server experiment settings
     // (2) synchronous SDK initialization
     //     - initialize immediately with the given JSON datafile or its cached copy
     //     - no network delay, but the local copy is not guaranteed to be in sync with the server experiment settings
-
+    
     [self initializeOptimizelySDKAsynchronous];
-    //[self initializeOptimizelySDKSynchronous];
-
     return YES;
 }
 
--(void)initializeOptimizelySDKAsynchronous {
-    self.optimizely = [[OptimizelyManager alloc] initWithSdkKey:kOptimizelySdkKey];
+// MARK: - Initialization Examples
 
-    [self.optimizely initializeSDKWithCompletion:^(NSData * _Nullable data, NSError * _Nullable error) {
+-(void)initializeOptimizelySDKAsynchronous {
+    self.optimizely = [[OptimizelyClient alloc] initWithSdkKey:kOptimizelySdkKey];
+    
+    [self.optimizely startWithCompletion:^(NSData *data, NSError *error) {
         if (error == nil) {
             NSLog(@"Optimizely SDK initialized successfully!");
         } else {
             NSLog(@"Optimizely SDK initiliazation failed: %@", error.localizedDescription);
             self.optimizely = nil;
         }
 
-        [self.optimizely.notificationCenter addActivateNotificationListenerWithActivateListener:^(NSDictionary<NSString *,id> * _Nonnull experiment, NSString * _Nonnull userId, NSDictionary<NSString *,id> * _Nullable attributes, NSDictionary<NSString *,id> * _Nonnull variation, NSDictionary<NSString *,id> * _Nonnull event) {
-            NSLog(@"got activate with experiment");
-            NSLog(@"%@", experiment[@"key"]);
-        }];
-        [self startAppWithExperimentActivated];
+        [self startWithRootViewController];
     }];
 }
 
 -(void)initializeOptimizelySDKSynchronous {
-    NSString *localDatafilePath = [[NSBundle bundleForClass:self.classForCoder] pathForResource:kOptimizelyDatafileName ofType:@"json"];
+    NSString *localDatafilePath = [[NSBundle mainBundle] pathForResource:kOptimizelyDatafileName ofType:@"json"];
     if (localDatafilePath == nil) {
         NSAssert(false, @"Local datafile cannot be found");
         self.optimizely = nil;
         return;
     }
 
-    self.optimizely = [[OptimizelyManager alloc] initWithSdkKey:kOptimizelySdkKey];
-    
-    // customization example (optional)
-    // TODO: add cutomization for ObjC
+    self.optimizely = [[OptimizelyClient alloc] initWithSdkKey:kOptimizelySdkKey];
 
     NSString *datafileJSON = [NSString stringWithContentsOfFile:localDatafilePath encoding:NSUTF8StringEncoding error:nil];
-        
+    
     if (datafileJSON == nil) {
         NSLog(@"Invalid JSON format");
         self.optimizely = nil;
     } else {
         NSError *error;
-        BOOL status = [self.optimizely initializeSDKWithDatafile:datafileJSON error:&error];
+        BOOL status = [self.optimizely startWithDatafile:datafileJSON error:&error];
         if (status) {
             NSLog(@"Optimizely SDK initialized successfully!");
         } else {
@@ -105,72 +103,117 @@ -(void)initializeOptimizelySDKSynchronous {
         }
     }
 
-    [self startAppWithExperimentActivated];
-}
-     
--(void)startAppWithExperimentActivated {
-    NSError *error;
-    NSString *variationKey = [self.optimizely activateWithExperimentKey:kOptimizelyExperimentKey
-                                                                 userId:self.userId
-                                                             attributes:self.attributes
-                                                                  error:&error];
-    
-    if (variationKey == nil) {
-        NSLog(@"Optimizely SDK activation failed: %@", error.localizedDescription);
-        self.optimizely = nil;
-    }
-
-
-    [self setRootViewControllerWithOtimizelyManager:self.optimizely bucketedVariation:variationKey];
+    [self startWithRootViewController];
 }
 
--(void)setRootViewControllerWithOtimizelyManager:(OptimizelyManager*)manager bucketedVariation:(NSString*)variationKey {
-    dispatch_async(dispatch_get_main_queue(), ^{
+-(void)initializeOptimizelySDKWithCustomization {
+    // customization example (optional)
+    
+    CustomLogger *customLogger = [[CustomLogger alloc] init];
+    // 30 sec interval may be too frequent. This is for demo purpose.
+    // This should be should be much larger (default = 10 mins).
+    NSNumber *customDownloadIntervalInSecs = @(30);
+    
+    self.optimizely = [[OptimizelyClient alloc] initWithSdkKey:kOptimizelySdkKey
+                                                         logger:customLogger
+                                                eventDispatcher:nil
+                                             userProfileService:nil
+                                       periodicDownloadInterval:customDownloadIntervalInSecs
+                                                defaultLogLevel:OptimizelyLogLevelInfo];
+    
+    NSNumber *notifId;
+    notifId = [self.optimizely.notificationCenter addDecisionNotificationListenerWithDecisionListener:^(NSString *type,
+                                                                                              NSString *userId,
+                                                                                              NSDictionary<NSString *,id> *attributes,
+                                                                                              NSDictionary<NSString *,id> *decisionInfo) {
+        NSLog(@"Received decision notification: %@ %@ %@ %@", type, userId, attributes, decisionInfo);
+    }];
+    
+    notifId = [self.optimizely.notificationCenter addTrackNotificationListenerWithTrackListener:^(NSString *eventKey,
+                                                                                                  NSString *userId,
+                                                                                                  NSDictionary<NSString *,id> *attributes, NSDictionary<NSString *,id> *eventTags, NSDictionary<NSString *,id> *event) {
+        NSLog(@"Received track notification: %@ %@ %@ %@ %@", eventKey, userId, attributes, eventTags, event);
 
 #if TARGET_OS_IOS
-        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"iOSMain" bundle:nil];
-#else
-        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"tvOSMain" bundle:nil];
+        // Amplitude example
+        NSString *propertyKey = [NSString stringWithFormat:@"[Optimizely] %@", eventKey];
+        AMPIdentify *identify = [[AMPIdentify alloc] init];
+        [identify set:propertyKey value:userId];
+        // Track event (optional)
+        NSString *eventIdentifier = [NSString stringWithFormat:@"[Optimizely] %@ - %@", eventKey, userId];
+        [Amplitude.instance logEvent:eventIdentifier];
 #endif
-        UIViewController *rootViewController;
+    }];
+    
+    [self.optimizely startWithCompletion:^(NSData *data, NSError *error) {
+        if (error == nil) {
+            NSLog(@"Optimizely SDK initialized successfully!");
+        } else {
+            NSLog(@"Optimizely SDK initiliazation failed: %@", error.localizedDescription);
+            self.optimizely = nil;
+        }
+        
+        [self startWithRootViewController];
+    }];
+}
+
+// MARK: - ViewControl
+
+-(void)startWithRootViewController {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSError *error;
+        NSString *variationKey = [self.optimizely activateWithExperimentKey:kOptimizelyExperimentKey
+                                                                     userId:self.userId
+                                                                 attributes:self.attributes
+                                                                      error:&error];
 
-        if ((manager != nil) && (variationKey != nil)) {
-            VariationViewController *vc = [storyboard instantiateViewControllerWithIdentifier: @"VariationViewController"];
-            
-            vc.eventKey = kOptimizelyEventKey;
-            vc.optimizely = manager;
-            vc.userId = self.userId;
-            vc.variationKey = variationKey;
-
-            rootViewController = vc;
+        if (variationKey != nil) {
+            [self openVariationViewWithVariationKey:variationKey];
         } else {
-            rootViewController = [storyboard instantiateViewControllerWithIdentifier:@"FailureViewController"];
+            NSLog(@"Optimizely SDK activation failed: %@", error.localizedDescription);
+            [self openFailureView];
         }
-            
-        self.window.rootViewController = rootViewController;
     });
 }
 
+-(void)openVariationViewWithVariationKey:(nullable NSString*)variationKey {
+    VariationViewController *variationViewController = [self.storyboard instantiateViewControllerWithIdentifier: @"VariationViewController"];
+    
+    variationViewController.optimizely = self.optimizely;
+    variationViewController.userId = self.userId;
+    variationViewController.variationKey = variationKey;
+    variationViewController.eventKey = kOptimizelyEventKey;
+    
+    self.window.rootViewController = variationViewController;
+}
 
+-(void)openFailureView {
+    self.window.rootViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"FailureViewController"];
+}
 
-- (void)applicationWillResignActive:(UIApplication *)application {
+-(UIStoryboard*)storyboard {
+#if TARGET_OS_IOS
+    return [UIStoryboard storyboardWithName:@"iOSMain" bundle:nil];
+#else
+    return [UIStoryboard storyboardWithName:@"tvOSMain" bundle:nil];
+#endif
 }
 
+// MARK: - AppDelegate
 
-- (void)applicationDidEnterBackground:(UIApplication *)application {
+- (void)applicationWillResignActive:(UIApplication *)application {
 }
 
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+}
 
 - (void)applicationWillEnterForeground:(UIApplication *)application {
 }
 
-
 - (void)applicationDidBecomeActive:(UIApplication *)application {
 }
 
-
 - (void)applicationWillTerminate:(UIApplication *)application {
 }
 
-
 @end

DemoObjCApp/Customization/CustomLogger.h

@@ -18,10 +18,13 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@protocol OPTLogger
+@protocol OPTLogger;
 
-@end
 @interface CustomLogger : NSObject <OPTLogger>
++ (enum OptimizelyLogLevel)logLevel;
++ (void)setLogLevel:(enum OptimizelyLogLevel)value;
+- (nonnull instancetype)init;
+- (void)logWithLevel:(enum OptimizelyLogLevel)level message:(NSString *)message;
 @end
 
 NS_ASSUME_NONNULL_END

DemoObjCApp/Customization/CustomLogger.m

@@ -28,4 +28,18 @@ -(instancetype)init {
     return self;
 }
 
+- (void)logWithLevel:(enum OptimizelyLogLevel)level message:(NSString * _Nonnull)message {
+    if (level <= CustomLogger.logLevel) {
+        NSLog(@"🐱 - [\(level.name)] Kitty - %@", message);
+    }
+}
+
+static enum OptimizelyLogLevel logLevel = OptimizelyLogLevelInfo;
++(enum OptimizelyLogLevel)logLevel {
+    return logLevel;
+}
++(void)setLogLevel:(enum OptimizelyLogLevel)value {
+    logLevel = value;
+}
+
 @end