Incorporate misc code review changes, typos, error messages etc.

Author: tapashmajumder

.gitignore

@@ -10,3 +10,4 @@ Pods/
 
 scripts/
 
+dev.config

Tests/swift-sdk-objc-tests/IterableAPITests.m

@@ -123,7 +123,7 @@ - (void)testUniversalDeeplinkNoRewrite {
 }
 
 - (void)testHandleUniversalLinkRewrite {
-    XCTestExpectation *expectation = [self expectationWithDescription:@"High Expectations"];
+    XCTestExpectation *expectation = [self expectationWithDescription:@"urlDelegate is called"];
 
     MockUrlDelegate *urlDelegateMock = [[MockUrlDelegate alloc] initWithReturnValue:NO];
     urlDelegateMock.callback = ^(NSURL *url, IterableActionContext *context) {
@@ -140,9 +140,6 @@ - (void)testHandleUniversalLinkRewrite {
     [IterableAPI handleUniversalLink:iterableLink];
 
     [self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:^(NSError *error) {
-        if (error) {
-            NSLog(@"Timeout Error: %@", error);
-        }
     }];
 }
 

Tests/swift-sdk-swift-tests/IterableActionRunnerTests.swift

@@ -65,7 +65,7 @@ class IterableActionRunnerTests: XCTestCase {
         let customActionDelegate = MockCustomActionDelegate(returnValue: false)
         let action = IterableAction.action(fromDictionary: ["type" : "customActionName"])!
         let actionRunner = IterableActionRunner(urlDelegate: nil, customActionDelegate: customActionDelegate, urlOpener: MockUrlOpener())
-        _ = actionRunner.execute(action: action, from:.push)
+        _ = actionRunner.execute(action: action, from: .push)
 
         XCTAssertEqual(customActionDelegate.action, action)
     }

Tests/swift-sdk-swift-tests/IterableNotificationResponseTests.swift

@@ -200,6 +200,10 @@ class IterableNotificationResponseTests: XCTestCase {
     }
 
     func testLegacyDeeplinkPayload() {
+        guard @available(iOS 10, *) else {
+            return
+        }
+        
         let messageId = UUID().uuidString
         let userInfo: [AnyHashable : Any] = [
             "itbl" : [

sample-apps/objc-sample-app/objc-sample-app/AppDelegate.m

@@ -13,13 +13,19 @@
 @import IterableSDK;
 
 @interface AppDelegate ()
-
 @end
 
 @implementation AppDelegate
+NSString *apiKey = @""; // set iterable api key here
+NSString *email = @""; // set iterable email here
 
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+    // initial check
+    if (apiKey.length == 0 || email.length == 0) {
+        [NSException raise:@"Not Initialized" format:@"Iterable API key and email must be set."];
+    }
+    
     //ITBL: Setup Notifications
     [self setupNotifications];
 
@@ -30,10 +36,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     config.pushIntegrationName = @"objc-sample-app";
     config.sandboxPushIntegrationName = @"objc-sample-app";
 
-    [IterableAPI initializeWithApiKey:@"a415841b631a4c97924bc09660c658fc"
+    [IterableAPI initializeWithApiKey: apiKey
                            launchOptions:launchOptions
                                   config:config];
-    IterableAPI.sharedInstance.email = @"[email protected]";
+    IterableAPI.sharedInstance.email = email;
 
     return YES;
 }
@@ -107,7 +113,7 @@ - (BOOL)handleIterableURL:(NSURL *)url context:(IterableActionContext *)context
 - (BOOL)handleIterableCustomAction:(IterableAction *)action context:(IterableActionContext *)context {
     if ([action.type isEqualToString:@"handleFindCoffee"]) {
         if (action.userInput != nil) {
-            NSString *urlString = [[NSString alloc] initWithFormat:@"https://majumder/me/coffee?q=%@", action.userInput];
+            NSString *urlString = [[NSString alloc] initWithFormat:@"https://majumder.me/coffee?q=%@", action.userInput];
             NSURL *url = [[NSURL alloc] initWithString:urlString];
             [DeeplinkHandler handleURL:url];
         }

sample-apps/swift-sample-app/swift-sample-app/AppDelegate.swift

@@ -13,10 +13,18 @@ import IterableSDK
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-
+    // ITBL: replace with your api key and email.
+    let apiKey = "" // set Iterable api key here
+    let email = "" // set Iterable user email here.
+    
     var window: UIWindow?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+        // Initial check
+        if apiKey.isEmpty || email.isEmpty {
+            fatalError("Iterable API Key and email need to be set.")
+        }
+        
         //ITBL: Setup Notification
         setupNotifications()
 
@@ -26,11 +34,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         config.urlDelegate = self
         config.pushIntegrationName = "swift-sample-app"
         config.sandboxPushIntegrationName = "swift-sample-app"
-        // !! Replace with your api key and email here.
-        IterableAPI.initialize(apiKey:"a415841b631a4c97924bc09660c658fc",
+        // Replace with your api key and email here.
+        IterableAPI.initialize(apiKey: apiKey,
                                   launchOptions:launchOptions,
                                   config: config)
-        IterableAPI.sharedInstance?.email = "[email protected]"
+        IterableAPI.sharedInstance?.email = email
 
         return true
     }

swift-sdk/IterableAPI+Internal.swift

@@ -38,14 +38,13 @@ extension IterableAPI {
         }
         if let remoteNotificationPayload = launchOptions[UIApplicationLaunchOptionsKey.remoteNotification] as? [AnyHashable : Any] {
             if let _ = IterableUtil.rootViewController {
+                // we are ready
+                IterableAppIntegration.minion?.performDefaultNotificationAction(remoteNotificationPayload)
+            } else {
                 // keywindow not set yet
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                     IterableAppIntegration.minion?.performDefaultNotificationAction(remoteNotificationPayload)
                 }
-                
-            } else {
-                // we are ready
-                IterableAppIntegration.minion?.performDefaultNotificationAction(remoteNotificationPayload)
             }
         }
     }
@@ -94,18 +93,16 @@ extension IterableAPI {
                 ITBL_KEY_EMAIL: email,
                 ITBL_KEY_DEVICE: deviceDictionary
             ]
+        } else if let userId = userId {
+            args = [
+                ITBL_KEY_USER_ID: userId,
+                ITBL_KEY_DEVICE: deviceDictionary
+            ]
         } else {
-            if let userId = userId {
-                args = [
-                    ITBL_KEY_USER_ID: userId,
-                    ITBL_KEY_DEVICE: deviceDictionary
-                ]
-            } else {
-                ITBError("Either email or userId is required.")
-                args = [
-                    ITBL_KEY_DEVICE: deviceDictionary
-                ]
-            }
+            ITBError("Either email or userId is required.")
+            args = [
+                ITBL_KEY_DEVICE: deviceDictionary
+            ]
         }
 
         ITBInfo("sending registerToken request with args \(args)")

swift-sdk/IterableAPI.swift

@@ -810,8 +810,8 @@ import Foundation
      - returns: true if it is an Iterable link, or the value returned from `IterableURLDelegate` otherwise
      */
     @objc @discardableResult public static func handleUniversalLink(_ url: URL) -> Bool {
-        if let zeeInstance = _sharedInstance {
-            return zeeInstance.deeplinkManager.handleUniversalLink(url)
+        if let instance = _sharedInstance {
+            return instance.deeplinkManager.handleUniversalLink(url)
         } else {
             return false
         }

swift-sdk/IterableAPNSUtil.swift

@@ -66,9 +66,9 @@ struct IterableAPNSUtil {
         let scanner = Scanner(string: string)
         var buffer: NSString?
         guard
-            scanner.scanUpTo(begin, into: nil)
-            ,scanner.scanUpTo(end, into: &buffer)
-            ,let plistString = buffer
+            scanner.scanUpTo(begin, into: nil),
+            scanner.scanUpTo(end, into: &buffer),
+            let plistString = buffer
 
             else {
                 return nil

swift-sdk/IterableDeeplinkManager.swift

@@ -40,7 +40,7 @@ class IterableDeeplinkManager : NSObject {
      - returns: true if it is an Iterable link, or the value returned from `IterableURLDelegate` otherwise
      */
     func handleUniversalLink(_ url: URL) -> Bool {
-        if isDeeplink(url.absoluteString) {
+        if isIterableDeeplink(url.absoluteString) {
             resolve(applinkURL: url) {[actionRunner] (resolvedUrl) in
                 var resolvedUrlString: String
                 if let resolvedUrl = resolvedUrl {
@@ -76,7 +76,7 @@ class IterableDeeplinkManager : NSObject {
         deeplinkTemplateId = nil
         deeplinkMessageId = nil
 
-        if isDeeplink(applinkURL.absoluteString) {
+        if isIterableDeeplink(applinkURL.absoluteString) {
             let trackAndRedirectTask = redirectUrlSession.dataTask(with: applinkURL) {[unowned self] (data, response, error) in
                 if let error = error {
                     ITBError("error: \(error.localizedDescription)")
@@ -98,7 +98,7 @@ class IterableDeeplinkManager : NSObject {
         }
     }
 
-    private func isDeeplink(_ urlString: String) -> Bool {
+    private func isIterableDeeplink(_ urlString: String) -> Bool {
         guard let regex = try? NSRegularExpression(pattern: ITBL_DEEPLINK_IDENTIFIER, options: []) else {
             return false
         }