fixes

Author: devcsomnicg

swift-sdk/Internal/EmptyInAppManager.swift

@@ -33,14 +33,24 @@ class EmptyInAppManager: IterableInternalInAppManagerProtocol {
 
     func show(message _: IterableInAppMessage, consume _: Bool, callback _: ITBURLCallback?) {}
 
+    func remove(message _: IterableInAppMessage) {}
+    
     func remove(message _: IterableInAppMessage, successHandler _: OnSuccessHandler?, failureHandler _: OnFailureHandler?) {}
 
+    func remove(message _: IterableInAppMessage, location _: InAppLocation) {}
+    
     func remove(message _: IterableInAppMessage, location _: InAppLocation, successHandler _: OnSuccessHandler?, failureHandler _: OnFailureHandler?) {}
 
+    func remove(message _: IterableInAppMessage, location _: InAppLocation, source _: InAppDeleteSource) {}
+    
     func remove(message _: IterableInAppMessage, location _: InAppLocation, source _: InAppDeleteSource, successHandler _: OnSuccessHandler?, failureHandler _: OnFailureHandler?) {}
 
+    func remove(message _: IterableInAppMessage, location _: InAppLocation, source _: InAppDeleteSource, inboxSessionId _: String?) {}
+    
     func remove(message _: IterableInAppMessage, location _: InAppLocation, source _: InAppDeleteSource, inboxSessionId _: String?, successHandler _: OnSuccessHandler?, failureHandler _: OnFailureHandler?) {}
 
+    func set(read _: Bool, forMessage _: IterableInAppMessage) {}
+    
     func set(read _: Bool, forMessage _: IterableInAppMessage, successHandler _: OnSuccessHandler?, failureHandler _: OnFailureHandler?) {}
 
     func getMessage(withId _: String) -> IterableInAppMessage? {

swift-sdk/Internal/InAppManager.swift

@@ -19,6 +19,13 @@ protocol IterableInternalInAppManagerProtocol: IterableInAppManagerProtocol, InA
     /// - parameter inboxSessionId: The ID of the inbox session that the message originates from.
     func handleClick(clickedUrl url: URL?, forMessage message: IterableInAppMessage, location: InAppLocation, inboxSessionId: String?)
 
+    
+    /// - 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`.`
+    /// - parameter inboxSessionId: The ID of the inbox session that the message originates from.
+    func remove(message: IterableInAppMessage, location: InAppLocation, source: InAppDeleteSource, inboxSessionId: String?)
+    
     /// - 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`.`
@@ -124,22 +131,39 @@ class InAppManager: NSObject, IterableInternalInAppManagerProtocol {
         }
     }
 
-    func remove(message: IterableInAppMessage, location: InAppLocation, successHandler: OnSuccessHandler? = nil, failureHandler: OnFailureHandler? = nil) {
+    func remove(message: IterableInAppMessage, location: InAppLocation) {
         ITBInfo()
+        
+        remove(message: message, location: location, successHandler: nil, failureHandler: nil)
+    }
+    
+    func remove(message: IterableInAppMessage, location: InAppLocation, successHandler: OnSuccessHandler? = nil, failureHandler: OnFailureHandler? = nil) {
         removePrivate(message: message, location: location, successHandler: successHandler, failureHandler: failureHandler)
     }
 
+    func remove(message: IterableInAppMessage, location: InAppLocation, source: InAppDeleteSource) {
+        remove(message: message, location: location, source: source, successHandler: nil, failureHandler: nil)
+    }
+    
     func remove(message: IterableInAppMessage, location: InAppLocation, source: InAppDeleteSource, successHandler: OnSuccessHandler? = nil, failureHandler: OnFailureHandler? = nil) {
-        ITBInfo()
+        
         removePrivate(message: message, location: location, source: source, successHandler: successHandler, failureHandler: failureHandler)
     }
 
-    func remove(message: IterableInAppMessage, location: InAppLocation, source: InAppDeleteSource, inboxSessionId: String? = nil, successHandler: OnSuccessHandler? = nil, failureHandler: OnFailureHandler? = nil) {
+    func remove(message: IterableInAppMessage, location: InAppLocation, source: InAppDeleteSource, inboxSessionId: String?) {
         ITBInfo()
 
+        remove(message: message, location: location, source: source, inboxSessionId: inboxSessionId, successHandler: nil, failureHandler: nil)
+    }
+    
+    func remove(message: IterableInAppMessage, location: InAppLocation, source: InAppDeleteSource, inboxSessionId: String? = nil, successHandler: OnSuccessHandler? = nil, failureHandler: OnFailureHandler? = nil) {
         removePrivate(message: message, location: location, source: source, inboxSessionId: inboxSessionId, successHandler: successHandler, failureHandler: failureHandler)
     }
 
+    func set(read: Bool, forMessage message: IterableInAppMessage) {
+        set(read: read, forMessage: message, successHandler: nil, failureHandler: nil)
+    }
+    
     func set(read: Bool, forMessage message: IterableInAppMessage, successHandler: OnSuccessHandler? = nil, failureHandler: OnFailureHandler? = nil) {
         updateMessage(message, read: read).onSuccess { [weak self] _ in
             successHandler?([:])
@@ -187,9 +211,13 @@ class InAppManager: NSObject, IterableInternalInAppManagerProtocol {
         }
     }
 
-    func remove(message: IterableInAppMessage, successHandler: OnSuccessHandler?, failureHandler: OnFailureHandler?) {
+    func remove(message: IterableInAppMessage) {
         ITBInfo()
-        
+
+        remove(message: message, successHandler: nil, failureHandler: nil)
+    }
+    
+    func remove(message: IterableInAppMessage, successHandler: OnSuccessHandler?, failureHandler: OnFailureHandler?) {
         removePrivate(message: message, location: .inApp, source: nil, successHandler: successHandler, failureHandler: failureHandler)
     }
 

swift-sdk/Internal/InboxState.swift

@@ -61,16 +61,14 @@ class InboxState: InboxStateProtocol {
     }
 
     func set(read: Bool, forMessage message: InboxMessageViewModel) {
-        inAppManager?.set(read: read, forMessage: message.iterableMessage, successHandler: nil, failureHandler: nil)
+        inAppManager?.set(read: read, forMessage: message.iterableMessage)
     }
 
     func remove(message: InboxMessageViewModel, inboxSessionId: String?) {
         inAppManager?.remove(message: message.iterableMessage,
                              location: .inbox,
                              source: .inboxSwipe,
-                             inboxSessionId: inboxSessionId,
-                             successHandler: nil,
-                             failureHandler: nil)
+                             inboxSessionId: inboxSessionId)
     }
 
     init(internalAPIProvider: @escaping @autoclosure () -> InternalIterableAPI? = IterableAPI.internalImplementation) {

swift-sdk/IterableInAppManagerProtocol.swift

@@ -28,24 +28,43 @@ import Foundation
     ///   Note that this callback is called in addition to calling `IterableCustomActionDelegate` or `IterableUrlDelegate` on the button action.
     @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 message: The message to remove.
     /// - parameter successHandler: The callback which returns `success.
     /// - parameter failureHandler: The callback which returns `failure.
     @objc(removeMessage:successHandler:failureHandler:) func remove(message: IterableInAppMessage, successHandler: OnSuccessHandler?, failureHandler: OnFailureHandler?)
 
+    
+    /// - 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 message: The message to remove.
     /// - parameter location: The location from where this message was shown. `inbox` or `inApp`.
     /// - parameter successHandler: The callback which returns `success.
     /// - parameter failureHandler: The callback which returns `failure.
     @objc(removeMessage:location:successHandler:failureHandler:) func remove(message: IterableInAppMessage, location: InAppLocation, successHandler: OnSuccessHandler?, failureHandler: OnFailureHandler?)
 
+    
+    /// - 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 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`.`
     /// - parameter successHandler: The callback which returns `success.
     /// - parameter failureHandler: The callback which returns `failure.
     @objc(removeMessage:location:source:successHandler:failureHandler:) func remove(message: IterableInAppMessage, location: InAppLocation, source: InAppDeleteSource, successHandler: OnSuccessHandler?, failureHandler: OnFailureHandler?)
 
+    /// - parameter read: Whether this inbox message was read
+    /// - parameter message: The inbox message
+    @objc(setRead:forMessage:) func set(read: Bool, forMessage message: IterableInAppMessage)
+    
     /// - parameter read: Whether this inbox message was read
     /// - parameter message: The inbox message
     /// - parameter successHandler: The callback which returns `success.