Merge branch 'master' of github.com:Leanplum/Leanplum-iOS-SDK into release/6.5.0

Author: nzagorchev

LeanplumSDK/LeanplumSDK/ClassesSwift/Migration/LPCTNotificationsManager.swift

@@ -13,7 +13,7 @@ import Foundation
     // Using NSNumber since Optional Bool cannot be represented in Objective-C
     @objc public var openDeepLinksInForeground: NSNumber?
     @objc public var handleCleverTapNotificationBlock: LeanplumHandleCleverTapNotificationBlock?
-    private(set) var handlePushNotificationFromCleverTap = false
+
 
     enum NotificationEvent: String, CustomStringConvertible {
         case opened = "Open"
@@ -33,16 +33,6 @@ import Foundation
         // If the app is launched from notification and CT instance has already been created,
         // CT will handle the notification from their UIApplication didFinishLaunchingNotification observer
         if fromLaunch && MigrationManager.shared.hasLaunched {
-            // If the app is using AppDelegate only, push notification at app launched will
-            // be handled from CleverTap. Setting `handlePushNotificationFromCleverTap` to true
-            // here ensures that app is launched from killed state and using AppDelegate file only.
-            handlePushNotificationFromCleverTap = true
-            return
-        }
-        
-        if handlePushNotificationFromCleverTap && MigrationManager.shared.hasLaunched {
-            Log.info("[Wrapper] Push Notification will be handled from CleverTap: \(userInfo)")
-            handlePushNotificationFromCleverTap = false
             return
         }
 

LeanplumSDK/LeanplumSDK/ClassesSwift/Migration/MigrationManager+API.swift

@@ -47,7 +47,7 @@
     }
 
     func track(_ eventName: String?, value: Double, info: String?, params: [String: Any]) {
-        wrapper?.track(eventName, value: value, info: info, params: params)
+        wrapper?.track(eventName, value: value, params: params)
     }
 
     func trackPurchase(_ eventName: String?, value: Double, currencyCode: String?, params: [String: Any]) {
@@ -71,7 +71,7 @@
     }
 
     func advance(_ eventName: String?, info: String?, params: [String: Any]) {
-        wrapper?.advance(eventName, info: info, params: params)
+        wrapper?.advance(eventName, params: params)
     }
 
     func setUserAttributes(_ attributes: [AnyHashable: Any]) {

LeanplumSDK/LeanplumSDK/ClassesSwift/Migration/Wrapper/CTWrapper.swift

@@ -15,7 +15,6 @@ class CTWrapper: Wrapper {
         static let StatePrefix = "state_"
 
         static let ValueParamName = "value"
-        static let InfoParamName = "info"
         static let ChargedEventParam = "event"
         static let CurrencyCodeParam = "currencyCode"
         static let iOSTransactionIdentifierParam = "iOSTransactionIdentifier"
@@ -125,7 +124,7 @@ class CTWrapper: Wrapper {
     }
 
     // MARK: Tracking
-    func track(_ eventName: String?, value: Double, info: String?, params: [String: Any]) {
+    func track(_ eventName: String?, value: Double, params: [String: Any]) {
         // message impression events come with event: nil
         // do not track Push Delivered in CT
         guard let eventName = eventName, eventName != PUSH_DELIVERED_EVENT_NAME else {
@@ -134,23 +133,19 @@ class CTWrapper: Wrapper {
 
         var eventParams = params.mapValues(transformArrayValues)
         eventParams[Constants.ValueParamName] = value
-        
-        if let info = info {
-            eventParams[Constants.InfoParamName] = info
-        }
 
         Log.debug("Leanplum.track will call recordEvent with \(eventName) and \(eventParams)")
         cleverTapInstance?.recordEvent(eventName, withProps: eventParams)
     }
 
-    func advance(_ stateName: String?, info: String?, params: [String: Any]) {
+    func advance(_ stateName: String?, params: [String: Any]) {
         guard let stateName = stateName else {
             return
         }
 
         let eventName = Constants.StatePrefix + stateName
         Log.debug("Leanplum.advance will call track with \(eventName) and \(params)")
-        track(eventName, value: 0.0, info: info, params: params)
+        track(eventName, value: 0.0, params: params)
     }
 
     func trackPurchase(_ eventName: String?, value: Double, currencyCode: String?, params: [String: Any]) {

LeanplumSDK/LeanplumSDK/ClassesSwift/Migration/Wrapper/Wrapper.swift

@@ -17,11 +17,11 @@ protocol Wrapper {
 
     func removeInstanceCallback(_ callback: CleverTapInstanceCallback)
 
-    func track(_ eventName: String?, value: Double, info: String?, params: [String: Any])
+    func track(_ eventName: String?, value: Double, params: [String: Any])
 
     func trackPurchase(_ eventName: String?, value: Double, currencyCode: String?, params: [String: Any])
 
-    func advance(_ stateName: String?, info: String?, params: [String: Any])
+    func advance(_ stateName: String?, params: [String: Any])
 
     func trackInAppPurchase(_ eventName: String?,
                             value: Double,