Merge pull request #1799 from OneSignal/fix/iam

emawby · web-flow · commit ed80fcc1f30b · 2023-08-10T09:34:15.000-07:00
[5.0.0] Fix IAM display &amp; dismiss bugs
diff --git a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt
@@ -393,11 +393,9 @@ internal class InAppMessagesManager(
         }
 
         // fire the external callback
-        if (!_lifecycleCallback.hasSubscribers) {
-            Logging.verbose("InAppMessagesManager.messageWasDismissed: inAppMessageLifecycleHandler is null")
-            return
+        if (_lifecycleCallback.hasSubscribers) {
+            _lifecycleCallback.fireOnMain { it.onDidDismiss(InAppMessageLifecycleEvent(message)) }
         }
-        _lifecycleCallback.fireOnMain { it.onDidDismiss(InAppMessageLifecycleEvent(message)) }
 
         _state.inAppMessageIdShowing = null
 

Original file line number	Diff line number	Diff line change
`@@ -393,11 +393,9 @@ internal class InAppMessagesManager(`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`// fire the external callback`
`396`		`- if (!_lifecycleCallback.hasSubscribers) {`
`397`		`- Logging.verbose("InAppMessagesManager.messageWasDismissed: inAppMessageLifecycleHandler is null")`
`398`		`- return`
	`396`	`+ if (_lifecycleCallback.hasSubscribers) {`
	`397`	`+ _lifecycleCallback.fireOnMain { it.onDidDismiss(InAppMessageLifecycleEvent(message)) }`
`399`	`398`	`}`
`400`		`- _lifecycleCallback.fireOnMain { it.onDidDismiss(InAppMessageLifecycleEvent(message)) }`
`401`	`399`
`402`	`400`	`_state.inAppMessageIdShowing = null`
`403`	`401`