Merge pull request #65 from hamayokokuririn/fix/set-displayDelegate

Fix image-only and banner message repeatedly displaying after app restart

Author: fumito-ito

Sources/SwiftyInAppMessaging/Default/Banner/InAppDefaultBannerMessageHandler.swift

@@ -10,7 +10,7 @@
     import Foundation
     import UIKit
 
-    struct InAppDefaultBannerMessageHandler: InAppBannerMessageHandler {
+    class InAppDefaultBannerMessageHandler: InAppBannerMessageHandler {
         let messageForDisplay: InAppMessagingBannerDisplay
         weak private(set) var displayDelegate: InAppMessagingDisplayDelegate?
 
@@ -21,6 +21,8 @@
         }
 
         func displayMessage(with delegate: InAppMessagingDisplayDelegate) {
+            self.displayDelegate = delegate
+
             let bannerImage = try? UIImage(imageData: self.messageForDisplay.imageData)
 
             let viewController = InAppDefaultBannerMessageViewController(

Sources/SwiftyInAppMessaging/Default/ImageOnly/InAppDefaultImageOnlyMessageHandler.swift

@@ -9,7 +9,7 @@
     import Foundation
     import UIKit
 
-    struct InAppDefaultImageOnlyMessageHandler: InAppImageOnlyMessageHandler {
+    class InAppDefaultImageOnlyMessageHandler: InAppImageOnlyMessageHandler {
         let messageForDisplay: InAppMessagingImageOnlyDisplay
         weak private(set) var displayDelegate: InAppMessagingDisplayDelegate?
 
@@ -20,6 +20,8 @@
         }
 
         func displayMessage(with delegate: InAppMessagingDisplayDelegate) throws {
+            self.displayDelegate = delegate
+
             let image = try UIImage(imageData: self.messageForDisplay.imageData)
             let viewController = InAppDefaultImageOnlyMessageViewController(
                 image: image,

Tests/SwiftyInAppMessagingTests/Utilities/DisplayMessage.swift

@@ -12,8 +12,8 @@
         messageID: String = "",
         campaignName: String = "",
         renderAsTestMessage: Bool = false,
-        messageType: FIRInAppMessagingDisplayMessageType,
-        triggerType: FIRInAppMessagingDisplayTriggerType = .onAppForeground
+        messageType: InAppMessagingDisplayMessageType,
+        triggerType: InAppMessagingDisplayTriggerType = .onAppForeground
     ) -> InAppMessagingDisplayMessage {
         switch messageType {
         case .modal:

Tests/SwiftyInAppMessagingTests/Utilities/Handler.swift

@@ -16,7 +16,7 @@
         func displayMessage(with delegate: InAppMessagingDisplayDelegate) throws {
         }
 
-        func messageDismissed(dismissType: FIRInAppMessagingDismissType) {
+        func messageDismissed(dismissType: InAppMessagingDismissType) {
         }
 
         func messageClicked(with action: InAppMessagingAction) {