have the rest of the SDK call on the new functions

Author: roninopf

swift-sdk/Internal/InternalIterableAPI.swift

@@ -41,7 +41,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     }
 
     var lastPushPayload: [AnyHashable: Any]? {
-        localStorage.getPayload(currentDate: dateProvider.currentDate)
+        localStorage.getLastPushPayload(dateProvider.currentDate)
     }
 
     var attributionInfo: IterableAttributionInfo? {

swift-sdk/Internal/LocalStorage.swift

@@ -75,19 +75,22 @@ struct LocalStorage: LocalStorageProtocol {
         iterableUserDefaults.save(attributionInfo: attributionInfo, withExpiration: expiration)
     }
 
-    func getPayload(currentDate: Date) -> [AnyHashable: Any]? {
-        iterableUserDefaults.getPayload(currentDate: currentDate)
+    func getLastPushPayload(_ currentDate: Date) -> [AnyHashable: Any]? {
+        return keychain.getLastPushPayload(currentDate: currentDate)
     }
 
-    func save(payload: [AnyHashable: Any]?, withExpiration expiration: Date?) {
-        iterableUserDefaults.save(payload: payload, withExpiration: expiration)
+    func saveLastPushPayload(_ payload: [AnyHashable: Any]?, withExpiration expiration: Date?) {
+        keychain.setLastPushPayload(payload, withExpiration: expiration)
     }
 
     func upgrade() {
         ITBInfo()
 
         /// moves `email`, `userId`, and `authToken` from `UserDefaults` to `IterableKeychain`
         moveAuthDataFromUserDefaultsToKeychain()
+        
+        /// moves `lastPushPayload` from `UserDefaults` to `IterableKeychain`
+        moveLastPushPayloadFromUserDefaultsToKeychain()
     }
 
     // MARK: Private
@@ -117,4 +120,13 @@ struct LocalStorage: LocalStorageProtocol {
             ITBInfo("UPDATED: moved userId from UserDefaults to IterableKeychain")
         }
     }
+    
+    private func moveLastPushPayloadFromUserDefaultsToKeychain() {
+        // using current date rather than `DateProvider` for convenience
+        if let (userDefaultLastPushPayload, expiration) = iterableUserDefaults.getLastPushPayloadAndExpirationPair() {
+            keychain.setLastPushPayload(userDefaultLastPushPayload, withExpiration: expiration)
+            
+            ITBInfo("UPDATED: moved lastPushPayload from UserDefaults to IterableKeychain")
+        }
+    }
 }

swift-sdk/Internal/LocalStorageProtocol.swift

@@ -14,8 +14,8 @@ protocol LocalStorageProtocol {
     var offlineMode: Bool { get set }
     func getAttributionInfo(currentDate: Date) -> IterableAttributionInfo?
     func save(attributionInfo: IterableAttributionInfo?, withExpiration expiration: Date?)
-    func getPayload(currentDate: Date) -> [AnyHashable: Any]?
-    func save(payload: [AnyHashable: Any]?, withExpiration: Date?)
+    func getLastPushPayload(_ currentDate: Date) -> [AnyHashable: Any]?
+    func saveLastPushPayload(_ payload: [AnyHashable: Any]?, withExpiration expiration: Date?)
     func upgrade()
 }