Skip to content

Commit 2de5c46

Browse files
authored
Merge pull request #1846 from OneSignal/fix/in_app_npe_crash
Fix In-App Message auto-dismiss crash
2 parents 9a5c959 + cdc09c1 commit 2de5c46

File tree

1 file changed

+5
-4
lines changed
  • OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl

1 file changed

+5
-4
lines changed

OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/WebViewManager.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,14 @@ internal class WebViewManager(
279279
}
280280
Logging.debug("In app message, showing first one with height: $newHeight")
281281

282-
messageView!!.setWebView(webView!!)
282+
messageView?.setWebView(webView!!)
283283
if (newHeight != null) {
284284
lastPageHeight = newHeight
285-
messageView!!.updateHeight(newHeight)
285+
messageView?.updateHeight(newHeight)
286286
}
287-
messageView!!.showView(activity)
288-
messageView!!.checkIfShouldDismiss()
287+
// showView does not return until in-app is dismissed
288+
messageView?.showView(activity)
289+
messageView?.checkIfShouldDismiss()
289290
}
290291
}
291292

0 commit comments

Comments
 (0)