Add code for setRead/removeMessage callbacks

Author: devcsomnicg

swift-sdk/Constants.swift

@@ -381,6 +381,7 @@ public enum IterableCustomActionName: String, CaseIterable {
 
 public typealias ITEActionBlock = (String?) -> Void
 public typealias ITBURLCallback = (URL?) -> Void
+public typealias OnCompletionHandler = (Bool) -> Void
 public typealias OnSuccessHandler = (_ data: [AnyHashable: Any]?) -> Void
 public typealias OnFailureHandler = (_ reason: String?, _ data: Data?) -> Void
 public typealias UrlHandler = (URL) -> Bool

swift-sdk/Internal/InAppManager.swift

@@ -121,15 +121,15 @@ class InAppManager: NSObject, IterableInternalInAppManagerProtocol {
         }
     }
 
-    func remove(message: IterableInAppMessage, location: InAppLocation) {
+    func remove(message: IterableInAppMessage, location: InAppLocation, onCompletion: OnCompletionHandler?) {
         ITBInfo()
-        
+        self.completionHandler = onCompletion
         removePrivate(message: message, location: location)
     }
 
-    func remove(message: IterableInAppMessage, location: InAppLocation, source: InAppDeleteSource) {
+    func remove(message: IterableInAppMessage, location: InAppLocation, source: InAppDeleteSource, onCompletion: OnCompletionHandler?) {
         ITBInfo()
-        
+        self.completionHandler = onCompletion
         removePrivate(message: message, location: location, source: source)
     }
 
@@ -139,11 +139,15 @@ class InAppManager: NSObject, IterableInternalInAppManagerProtocol {
         removePrivate(message: message, location: location, source: source, inboxSessionId: inboxSessionId)
     }
 
-    func set(read: Bool, forMessage message: IterableInAppMessage) {
+    func set(read: Bool, forMessage message: IterableInAppMessage, onCompletion: OnCompletionHandler?) {
+        self.completionHandler = onCompletion
         updateMessage(message, read: read).onSuccess { [weak self] _ in
+            self?.completionHandler?(true)
             self?.callbackQueue.async { [weak self] in
                 self?.notificationCenter.post(name: .iterableInboxChanged, object: self, userInfo: nil)
             }
+        }.onError { [weak self] _ in
+            self?.completionHandler?(false)
         }
     }
 
@@ -183,7 +187,7 @@ class InAppManager: NSObject, IterableInternalInAppManagerProtocol {
         }
     }
 
-    func remove(message: IterableInAppMessage) {
+    func remove(message: IterableInAppMessage, onCompletion: OnCompletionHandler?) {
         ITBInfo()
 
         removePrivate(message: message)
@@ -470,8 +474,12 @@ class InAppManager: NSObject, IterableInternalInAppManagerProtocol {
                                      location: location,
                                      source: source,
                                      inboxSessionId: inboxSessionId,
-                                     onSuccess: nil,
-                                     onFailure: nil)
+                                     onSuccess: { (_ data: [AnyHashable: Any]?) in
+                                                    self.completionHandler?(true)
+                                     },
+                                     onFailure: { (_ reason: String?, _ data: Data?) in
+                                                    self.completionHandler?(false)
+                                                })
         callbackQueue.async { [weak self] in
             self?.notificationCenter.post(name: .iterableInboxChanged, object: self, userInfo: nil)
         }
@@ -533,6 +541,7 @@ class InAppManager: NSObject, IterableInternalInAppManagerProtocol {
     private var lastSyncTime: Date?
     private var moveToForegroundSyncInterval: Double = 1.0 * 60.0 // don't sync within sixty seconds
     private var autoDisplayPaused = false
+    private var completionHandler: OnCompletionHandler? = nil
 }
 
 extension InAppManager: InAppNotifiable {

swift-sdk/IterableInAppManagerProtocol.swift

@@ -29,20 +29,24 @@ import Foundation
     @objc(showMessage:consume:callbackBlock:) func show(message: IterableInAppMessage, consume: Bool, callback: ITBURLCallback?)
 
     /// - parameter message: The message to remove.
-    @objc(removeMessage:) func remove(message: IterableInAppMessage)
+    /// - parameter onCompletion: The callback which returns `success` or `failure`.
+    @objc(removeMessage:onCompletion:) func remove(message: IterableInAppMessage, onCompletion: OnCompletionHandler?)
 
     /// - parameter message: The message to remove.
     /// - parameter location: The location from where this message was shown. `inbox` or `inApp`.
-    @objc(removeMessage:location:) func remove(message: IterableInAppMessage, location: InAppLocation)
+    /// - parameter onCompletion: The callback which returns `success` or `failure`.
+    @objc(removeMessage:location:onCompletion:) func remove(message: IterableInAppMessage, location: InAppLocation, onCompletion: OnCompletionHandler?)
 
     /// - parameter message: The message to remove.
     /// - parameter location: The location from where this message was shown. `inbox` or `inApp`.
     /// - parameter source: The source of deletion `inboxSwipe` or `deleteButton`.`
-    @objc(removeMessage:location:source:) func remove(message: IterableInAppMessage, location: InAppLocation, source: InAppDeleteSource)
+    /// - parameter onCompletion: The callback which returns `success` or `failure`.
+    @objc(removeMessage:location:source:onCompletion:) func remove(message: IterableInAppMessage, location: InAppLocation, source: InAppDeleteSource, onCompletion: OnCompletionHandler?)
 
     /// - parameter read: Whether this inbox message was read
     /// - parameter message: The inbox message
-    @objc(setRead:forMessage:) func set(read: Bool, forMessage message: IterableInAppMessage)
+    /// - parameter onCompletion: The callback which returns `success` or `failure`.
+    @objc(setRead:forMessage:onCompletion:) func set(read: Bool, forMessage message: IterableInAppMessage, onCompletion: OnCompletionHandler?)
 
     /// - parameter id: The id of the message
     /// - returns: IterableInAppMessage with the id, if it exists.