Merge pull request #20652 from wordpress-mobile/issue/20647

Fixes: NullPointerException in SiteCreationActivity
wordpress-mobile · Apr 17, 2024 · 6ef913e · 6ef913e
2 parents 3f7287b + 141f222
commit 6ef913e
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -118,7 +118,7 @@ class SiteCreationActivity : LocaleAwareActivity(),
         mainViewModel.preloadThumbnails(this)
 
         observeVMState()
-        observeOverlayEvents(savedInstanceState)
+        observeOverlayEvents()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -169,20 +169,13 @@ class SiteCreationActivity : LocaleAwareActivity(),
         previewViewModel.onOkButtonClicked.observe(this, mainViewModel::onWizardFinished)
     }
 
-    private fun observeOverlayEvents(savedInstanceState: Bundle?) {
+    private fun observeOverlayEvents() {
         if(BuildConfig.IS_JETPACK_APP)
             return
 
-        val fragment =  if (savedInstanceState == null) {
-            JetpackFeatureFullScreenOverlayFragment
-                .newInstance(
-                    isSiteCreationOverlay = true,
-                    siteCreationSource = getSiteCreationSource()
-                )
-        }else {
-            supportFragmentManager.findFragmentByTag(JetpackFeatureFullScreenOverlayFragment.TAG)
-                    as JetpackFeatureFullScreenOverlayFragment
-        }
+        val fragment = supportFragmentManager.findFragmentByTag(JetpackFeatureFullScreenOverlayFragment.TAG)
+                    as? JetpackFeatureFullScreenOverlayFragment ?: JetpackFeatureFullScreenOverlayFragment
+                        .newInstance(isSiteCreationOverlay = true, siteCreationSource = getSiteCreationSource())
 
         jetpackFullScreenViewModel.action.observe(this) { action ->
             if (mainViewModel.siteCreationDisabled) finish()