From e8bb765ad79a28c48be2c831d3a78bd0d875dde5 Mon Sep 17 00:00:00 2001 From: ekager Date: Fri, 11 Oct 2019 08:31:09 -0700 Subject: [PATCH] For #5947 - Fix engineView NullPointerException --- .../org/mozilla/fenix/browser/BaseBrowserFragment.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index cb1312a2a..6e140ebbf 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -19,6 +19,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.whenStarted import androidx.navigation.NavDirections import androidx.navigation.fragment.findNavController import com.google.android.material.snackbar.Snackbar @@ -403,9 +404,11 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs context?.let { engineView.captureThumbnail { bitmap -> lifecycleScope.launch { - swipeRefresh?.background = bitmap?.toDrawable(it.resources) - engineView.asView().visibility = View.GONE - findNavController().nav(R.id.browserFragment, directions) + whenStarted { + swipeRefresh?.background = bitmap?.toDrawable(it.resources) + engineView?.asView()?.visibility = View.GONE + findNavController().nav(R.id.browserFragment, directions) + } } } }