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

Author: nzagorchev

LeanplumSDK/LeanplumSDK/Classes/Internal/Leanplum.m

@@ -1103,7 +1103,9 @@ + (void)addUIApplicationObservers
                     //if they are changed the new valeus will be updated to server as well
                     [[Leanplum notificationsManager] updateNotificationSettings];
 
-                    [Leanplum resume];
+                    if ([Leanplum hasStarted]) {
+                        [Leanplum resume];
+                    }
 
                     // Used for push notifications iOS 9
                     [Leanplum notificationsManager].proxy.resumedTimeInterval = [[NSDate date] timeIntervalSince1970];

LeanplumSDK/LeanplumSDK/Classes/Managers/Networking/LPRequestSender.m

@@ -283,8 +283,6 @@ - (void)sendRequests
                 return;
             }
 
-            [[MigrationManager shared] handleMigrateStateWithMultiApiResponse:json];
-            
             // Delete events on success.
             [LPRequestBatchFactory deleteFinishedBatch:batch];
 
@@ -299,6 +297,8 @@ - (void)sendRequests
                                                                 operation:operation];
             }
 
+            [[MigrationManager shared] handleMigrateStateWithMultiApiResponse:json];
+            
             dispatch_semaphore_signal(semaphore);
             LP_END_TRY
 

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

@@ -17,7 +17,6 @@ import Foundation
         static let AttributeMappingsKey = "__leanplum_attribute_mappings"
 
         static let MigrateStateResponseParam = "migrateState"
-        static let MigrateStateNotificationInfo = "migrateState"
         static let SdkResponseParam = "sdk"
         static let CTResponseParam = "ct"
         static let AccountIdResponseParam = "accountId"
@@ -29,11 +28,6 @@ import Foundation
         static let CleverTapRequestArg = "ct"
     }
 
-    @objc
-    public class func lpMigrateStateNotificationInfo() -> String {
-        return Constants.MigrateStateNotificationInfo
-    }
-    
     @objc
     public class func lpCleverTapRequestArg() -> String {
         return Constants.CleverTapRequestArg

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

@@ -17,7 +17,7 @@ import Foundation
                                           key: Constants.MigrateStateResponseParam)
         else { return }
 
-        if let hash = getValue(dict: migrateState, key: Constants.HashKey) as? String,
+        if let hash = getValue(dict: migrateState, key: Constants.HashResponseParam) as? String,
            hash != self.migrationHash {
             Log.debug("[Wrapper] CleverTap Hash changed")
             fetchMigrationStateAsync {}
@@ -66,7 +66,7 @@ import Foundation
         if let sdk = getValue(dict: apiResponse, key: Constants.SdkResponseParam) as? String {
             migrationState = MigrationState(stringValue: sdk)
         }
-        if let hash = getValue(dict: apiResponse, key: Constants.HashKey) as? String {
+        if let hash = getValue(dict: apiResponse, key: Constants.HashResponseParam) as? String {
             migrationHash = hash
         }
     }