Return ShowInAppResult enum from IterableInAppManager.

Author: tapashmajumder

swift-sdk/Internal/IterableAPIInternal.swift

@@ -399,27 +399,30 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
         }
     }
 
-    func spawn(inAppNotification callbackBlock:ITEActionBlock?) {
-        getInAppMessages(1).flatMap { IterableInAppManager.handleInApp(withPayload: $0, callbackBlock: callbackBlock) }.onSuccess {
-            switch $0 {
-            case .success(opened: let opened, messageId: let messageId):
-                if opened {
-                    self.inAppConsume(messageId)
+    @discardableResult func spawn(inAppNotification callbackBlock:ITEActionBlock?) -> Future<IterableInAppManager.ShowInAppResult> {
+        return getInAppMessages(1)
+            .map { IterableInAppManager.parseInApp(fromPayload: $0)}
+            .flatMap { IterableInAppManager.showInApp(parseResult: $0, callbackBlock: callbackBlock)}
+            .onSuccess {
+                switch $0 {
+                case .success(opened: let opened, messageId: let messageId):
+                    if opened {
+                        self.inAppConsume(messageId)
+                    }
+                case .failure(reason: let reason, messageId: let messageId):
+                    if let messageId = messageId {
+                        self.inAppConsume(messageId)
+                    }
+                    ITBError(reason)
                 }
-            case .failure(reason: let reason, messageId: let messageId):
-                if let messageId = messageId {
-                    self.inAppConsume(messageId)
-                }
-                ITBError(reason)
             }
-        }
     }
 
-    func getInAppMessages(_ count: NSNumber) -> Future<SendRequestValue> {
+    @discardableResult func getInAppMessages(_ count: NSNumber) -> Future<SendRequestValue> {
         return getInAppMessages(count, onSuccess: IterableAPIInternal.defaultOnSucess(identifier: "getMessages"), onFailure: IterableAPIInternal.defaultOnFailure(identifier: "getMessages"))
     }
 
-    func getInAppMessages(_ count: NSNumber, onSuccess: OnSuccessHandler?, onFailure: OnFailureHandler?) -> Future<SendRequestValue> {
+    @discardableResult func getInAppMessages(_ count: NSNumber, onSuccess: OnSuccessHandler?, onFailure: OnFailureHandler?) -> Future<SendRequestValue> {
         guard email != nil || userId != nil else {
             ITBError("Both email and userId are nil")
             onFailure?("Both email and userId are nil", nil)

swift-sdk/Internal/IterableInAppManager.swift

@@ -170,16 +170,15 @@ class IterableInAppManager: NSObject {
         }
     }
 
-    enum HandleInAppResult {
+    enum ShowInAppResult {
         case success(opened: Bool, messageId: String)
         case failure(reason: String, messageId: String?)
     }
 
-    static func handleInApp(withPayload payload: [AnyHashable : Any], callbackBlock:ITEActionBlock?) -> Future<HandleInAppResult> {
-        let parseResult = parseInApp(fromPayload: payload)
+    static func showInApp(parseResult: InAppParseResult, callbackBlock:ITEActionBlock?) -> Future<ShowInAppResult> {
         switch parseResult {
         case .success(let inAppDetails):
-            let result = Promise<HandleInAppResult>()
+            let result = Promise<ShowInAppResult>()
             let notificationMetadata = IterableNotificationMetadata.metadata(fromInAppOptions: inAppDetails.messageId)
 
             DispatchQueue.main.async {
@@ -192,10 +191,11 @@ class IterableInAppManager: NSObject {
             }
             return result
         case .failure(let reason, let messageId):
-            return Promise<HandleInAppResult>(value: .failure(reason: reason, messageId: messageId))
+            return Promise<ShowInAppResult>(value: .failure(reason: reason, messageId: messageId))
         }
     }
 
+    
     private static func getTopViewController() -> UIViewController? {
         guard let rootViewController = IterableUtil.rootViewController else {
             return nil
@@ -207,12 +207,12 @@ class IterableInAppManager: NSObject {
         return topViewController
     }
 
-    private enum InAppParseResult {
+    enum InAppParseResult {
         case success(InAppDetails)
         case failure(reason: String, messageId: String?)
     }
 
-    private struct InAppDetails {
+    struct InAppDetails {
         let edgeInsets: UIEdgeInsets
         let backgroundAlpha: Double
         let messageId: String
@@ -221,7 +221,7 @@ class IterableInAppManager: NSObject {
 
     // Payload is what comes from Api
     // If successful you get InAppDetails
-    private static func parseInApp(fromPayload payload: [AnyHashable : Any]) -> InAppParseResult {
+    static func parseInApp(fromPayload payload: [AnyHashable : Any]) -> InAppParseResult {
         guard let dialogOptions = IterableInAppManager.getNextMessageFromPayload(payload) else {
             return .failure(reason: "No notifications found for inApp payload \(payload)", messageId: nil)
         }