Merge branch 'embedded-no-diff-merge' into MOB-7609

Author: Evan Greer

swift-sdk/Internal/DependencyContainerProtocol.swift

@@ -57,7 +57,7 @@ extension DependencyContainerProtocol {
     }
 
     func createEmbeddedManager(config: IterableConfig,
-                                        apiClient: ApiClientProtocol) -> IterableEmbeddedManagerProtocol {
+                                        apiClient: ApiClientProtocol) -> IterableInternalEmbeddedManagerProtocol {
         IterableEmbeddedManager(apiClient: apiClient,
                                 urlDelegate: config.urlDelegate,
                                 customActionDelegate: config.customActionDelegate,

swift-sdk/Internal/EmptyEmbeddedManager.swift

@@ -5,10 +5,6 @@
 import Foundation
 
 class EmptyEmbeddedManager: IterableEmbeddedManagerProtocol {
-    func resolveMessages(_ messages: [IterableEmbeddedMessage], completion: @escaping ([ResolvedMessage]) -> Void) {
-
-    }
-    
     func addUpdateListener(_ listener: IterableEmbeddedUpdateDelegate) {
 
     }

swift-sdk/Internal/InternalIterableAPI.swift

@@ -82,7 +82,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         self.dependencyContainer.createAuthManager(config: self.config)
     }()
 
-    lazy var embeddedManager: IterableEmbeddedManagerProtocol = {
+    lazy var embeddedManager: IterableInternalEmbeddedManagerProtocol = {
         self.dependencyContainer.createEmbeddedManager(config: self.config,
                                                                 apiClient: self.apiClient)
     }()
@@ -685,7 +685,8 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
                                                                                customActionDelegate: config.customActionDelegate,
                                                                                urlOpener: urlOpener,
                                                                                allowedProtocols: config.allowedProtocols,
-                                                                               inAppNotifiable: inAppManager)
+                                                                               inAppNotifiable: inAppManager,
+                                                                               embeddedNotifiable: embeddedManager)
 
         handle(launchOptions: launchOptions)
 

swift-sdk/Internal/InternalIterableAppIntegration.swift

@@ -117,19 +117,22 @@ struct InternalIterableAppIntegration {
     private let urlOpener: UrlOpenerProtocol?
     private let allowedProtocols: [String]
     private weak var inAppNotifiable: InAppNotifiable?
+    private weak var embeddedNotifiable: EmbeddedNotifiable?
 
     init(tracker: PushTrackerProtocol,
          urlDelegate: IterableURLDelegate? = nil,
          customActionDelegate: IterableCustomActionDelegate? = nil,
          urlOpener: UrlOpenerProtocol? = nil,
          allowedProtocols: [String] = [],
-         inAppNotifiable: InAppNotifiable) {
+         inAppNotifiable: InAppNotifiable,
+         embeddedNotifiable: EmbeddedNotifiable) {
         self.tracker = tracker
         self.urlDelegate = urlDelegate
         self.customActionDelegate = customActionDelegate
         self.urlOpener = urlOpener
         self.allowedProtocols = allowedProtocols
         self.inAppNotifiable = inAppNotifiable
+        self.embeddedNotifiable = embeddedNotifiable
     }
 
     /**
@@ -147,6 +150,8 @@ struct InternalIterableAppIntegration {
             switch silentPush.notificationType {
             case .update:
                 _ = inAppNotifiable?.scheduleSync()
+            case .updateEmbedded:
+                embeddedNotifiable?.syncMessages {}
             case .remove:
                 if let messageId = silentPush.messageId {
                     inAppNotifiable?.onInAppRemoved(messageId: messageId)

swift-sdk/Internal/IterableEmbeddedManager.swift

@@ -5,42 +5,11 @@
 import Foundation
 import UIKit
 
-public struct ResolvedMessage: Equatable {
-    public let title: String?
-    public let description: String?
-    public var image: UIImage?
-    public var imageAccessibilityLabel: String?
-    public let buttonText: String?
-    public let buttonTwoText: String?
-    public let message: IterableEmbeddedMessage
-
-    init(title: String?,
-         description: String?,
-         image: UIImage?,
-         imageAccessibilityLabel: String?,
-         buttonText: String?,
-         buttonTwoText: String?,
-         message: IterableEmbeddedMessage) {
-        self.title = title
-        self.description = description
-        self.image = image
-        self.imageAccessibilityLabel = imageAccessibilityLabel
-        self.buttonText = buttonText
-        self.buttonTwoText = buttonTwoText
-        self.message = message
-    }
-    
-    public static func ==(lhs: ResolvedMessage, rhs: ResolvedMessage) -> Bool {
-            return lhs.title == rhs.title &&
-                   lhs.description == rhs.description &&
-                   lhs.image == rhs.image &&
-                   lhs.buttonText == rhs.buttonText &&
-                   lhs.buttonTwoText == rhs.buttonTwoText &&
-                   lhs.message == rhs.message
-        }
+protocol IterableInternalEmbeddedManagerProtocol: IterableEmbeddedManagerProtocol, EmbeddedNotifiable {
+    // we can add the internal delegate methods here
 }
 
-class IterableEmbeddedManager: NSObject, IterableEmbeddedManagerProtocol {
+class IterableEmbeddedManager: NSObject, IterableInternalEmbeddedManagerProtocol {
     init(apiClient: ApiClientProtocol,
          urlDelegate: IterableURLDelegate?,
          customActionDelegate: IterableCustomActionDelegate?,
@@ -76,86 +45,13 @@ class IterableEmbeddedManager: NSObject, IterableEmbeddedManagerProtocol {
         return messages[placementId] ?? []
     }
 
-    public func resolveMessages(_ messages: [IterableEmbeddedMessage], completion: @escaping ([ResolvedMessage]) -> Void) {
-        var resolvedMessages: [Int: ResolvedMessage] = [:]
-
-        let group = DispatchGroup()
-
-        for (index, message) in messages.enumerated() {
-            group.enter()
-
-            let title = message.elements?.title
-            let description = message.elements?.body
-            let imageUrl = message.elements?.mediaUrl
-            let imageAccessiblityLabel = message.elements?.mediaUrlCaption
-            let buttonText = message.elements?.buttons?.first?.title
-            let buttonTwoText = message.elements?.buttons?.count ?? 0 > 1 ? message.elements?.buttons?[1].title : nil
-
-            DispatchQueue.global().async {
-                if let imageUrl = imageUrl, let url = URL(string: imageUrl) {
-                    var request = URLRequest(url: url)
-                    request.setValue("Mozilla/5.0 (iPhone; CPU iPhone OS 16_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5 Mobile/15E148 Safari/604.1", forHTTPHeaderField: "User-Agent")
-
-                    let config = URLSessionConfiguration.default
-                    config.httpAdditionalHeaders = request.allHTTPHeaderFields
-
-                    let session = URLSession(configuration: config)
-
-                    session.dataTask(with: request) { (data, _, _) in
-                        defer { group.leave() }
-
-                        guard let imageData = data else {
-                            print("Unable to load image data")
-                            return
-                        }
-
-                        let resolvedMessage = ResolvedMessage(title: title,
-                                                              description: description,
-                                                              image: UIImage(data: imageData),
-                                                              imageAccessibilityLabel: imageAccessiblityLabel,
-                                                              buttonText: buttonText,
-                                                              buttonTwoText: buttonTwoText,
-                                                              message: message)
-
-                        DispatchQueue.main.async {
-                            resolvedMessages[index] = resolvedMessage
-                        }
-
-                    }.resume()
-                } else {
-                    let resolvedMessage = ResolvedMessage(title: title,
-                                                          description: description,
-                                                          image: nil,
-                                                          imageAccessibilityLabel: nil,
-                                                          buttonText: buttonText,
-                                                          buttonTwoText: buttonTwoText,
-                                                          message: message)
-                    DispatchQueue.main.async {
-                        resolvedMessages[index] = resolvedMessage
-                        group.leave()
-                    }
-                }
-            }
-
-        }
-
-        group.notify(queue: .main) {
-            let sortedResolvedMessages = resolvedMessages.sorted { $0.key < $1.key }.map { $0.value }
-            completion(sortedResolvedMessages)
-        }
-    }
-    
     public func addUpdateListener(_ listener: IterableEmbeddedUpdateDelegate) {
         listeners.add(listener)
     }
 
     public func removeUpdateListener(_ listener: IterableEmbeddedUpdateDelegate) {
         listeners.remove(listener)
     }
-
-    public func syncMessages(completion: @escaping () -> Void) {
-        retrieveEmbeddedMessages(completion: completion)
-    }
 
     public func handleEmbeddedClick(message: IterableEmbeddedMessage, buttonIdentifier: String?, clickedUrl: String) {
         if let url = URL(string: clickedUrl) {
@@ -341,3 +237,9 @@ class IterableEmbeddedManager: NSObject, IterableEmbeddedManagerProtocol {
         }
     }
 }
+
+extension IterableEmbeddedManager: EmbeddedNotifiable {
+    public func syncMessages(completion: @escaping () -> Void) {
+        retrieveEmbeddedMessages(completion: completion)
+    }
+}

swift-sdk/Internal/MiscEmbeddedClasses.swift

@@ -32,6 +32,10 @@ public class IterableEmbeddedImpression: NSObject, Codable {
     }
 }
 
+protocol EmbeddedNotifiable: AnyObject {
+    func syncMessages(completion: @escaping () -> Void)
+}
+
 /// Encapsulates an Embedded Session
 final public class IterableEmbeddedSession: NSObject, Codable {
     /// UUID of the session

swift-sdk/Internal/NotificationHelper.swift

@@ -19,6 +19,7 @@ struct ITBLSilentPushNotificationInfo {
     enum ITBLSilentPushNotificationType: String, Codable {
         case remove = "InAppRemove"
         case update = "InAppUpdate"
+        case updateEmbedded = "UpdateEmbedded"
     }
 
     static func parse(notification: [AnyHashable: Any]) -> ITBLSilentPushNotificationInfo? {

swift-sdk/IterableEmbeddedManagerProtocol.swift

@@ -7,7 +7,6 @@ import Foundation
 public protocol IterableEmbeddedManagerProtocol {
     func getMessages() -> [IterableEmbeddedMessage]
     func getMessages(for placementId: Int) -> [IterableEmbeddedMessage]
-    func resolveMessages(_ messages: [IterableEmbeddedMessage], completion: @escaping ([ResolvedMessage]) -> Void)
     func addUpdateListener(_ listener: IterableEmbeddedUpdateDelegate)
     func removeUpdateListener(_ listener: IterableEmbeddedUpdateDelegate)