Merge pull request #19753 from wordpress-mobile/issue/19336-fix-crash…

…-on-design-preview-screen Fix a crash on the design preview screen
wordpress-mobile · Dec 7, 2023 · 12baac7 · 12baac7
2 parents 9779ce2 + 0e3924b
commit 12baac7
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPreviewFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPreviewFragment.kt
@@ -75,7 +75,7 @@ abstract class LayoutPreviewFragment : FullscreenBottomSheetDialogFragment() {
     private fun initViewModel() {
         this.viewModel = getViewModel()
 
-        viewModel.previewState.observe(viewLifecycleOwner, { state ->
+        viewModel.previewState.observe(viewLifecycleOwner) { state ->
             when (state) {
                 is Loading -> {
                     binding?.desktopPreviewHint?.setVisible(false)
@@ -84,6 +84,7 @@ abstract class LayoutPreviewFragment : FullscreenBottomSheetDialogFragment() {
                     binding?.errorView?.setVisible(false)
                     binding?.webView?.loadUrl(state.url)
                 }
+
                 is Loaded -> {
                     binding?.progressBar?.setVisible(false)
                     binding?.webView?.setVisible(true)
@@ -97,21 +98,22 @@ abstract class LayoutPreviewFragment : FullscreenBottomSheetDialogFragment() {
                     )
                     AniUtils.animateBottomBar(binding?.desktopPreviewHint, true)
                 }
+
                 is Error -> {
                     binding?.progressBar?.setVisible(false)
                     binding?.webView?.setVisible(false)
                     binding?.errorView?.setVisible(true)
                     state.toast?.let { ToastUtils.showToast(requireContext(), it) }
                 }
             }
-        })
+        }
 
         // We're skipping the first emitted value since it derives from the view model initialization (`start` method)
-        viewModel.previewMode.skip(1).observe(viewLifecycleOwner, { load() })
+        viewModel.previewMode.skip(1).observe(viewLifecycleOwner) { load() }
 
-        viewModel.onPreviewModeButtonPressed.observe(viewLifecycleOwner, {
+        viewModel.onPreviewModeButtonPressed.observe(viewLifecycleOwner) {
             previewModeSelectorPopup.show(viewModel)
-        })
+        }
 
         binding?.previewTypeSelectorButton?.let {
             previewModeSelectorPopup = PreviewModeSelectorPopup(requireActivity(), it)
@@ -127,7 +129,7 @@ abstract class LayoutPreviewFragment : FullscreenBottomSheetDialogFragment() {
         binding?.webView?.webViewClient = object : WebViewClient() {
             override fun onPageFinished(view: WebView?, url: String?) {
                 super.onPageFinished(view, url)
-                if (view == null) return
+                if (!isAdded || view == null) return
                 val width = viewModel.selectedPreviewMode().previewWidth
                 setWebViewWidth(view, width)
                 val widthScript = context?.getString(R.string.web_preview_width_script, width)