fix(crash): AND-0000 fragment crash (#4258)

blockchain · Dec 19, 2022 · 2143346 · 2143346
1 parent e348478
commit 2143346
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/componentlib/src/main/java/com/blockchain/componentlib/system/EmbeddedFragment.kt b/componentlib/src/main/java/com/blockchain/componentlib/system/EmbeddedFragment.kt
@@ -1,11 +1,16 @@
 package com.blockchain.componentlib.system
 
-import android.widget.FrameLayout
+import android.view.View
+import android.view.ViewGroup
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.view.ViewCompat
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentContainerView
 import androidx.fragment.app.FragmentManager
 
 @Composable
@@ -15,19 +20,20 @@ fun EmbeddedFragment(
     modifier: Modifier = Modifier,
     tag: String
 ) {
+    var viewId by rememberSaveable { mutableStateOf(View.generateViewId()) }
+
     AndroidView(
         modifier = modifier,
         factory = { context ->
-            FrameLayout(context).apply {
-                id = ViewCompat.generateViewId()
-            }
+            fragmentManager.findFragmentById(viewId)?.view
+                ?.also { (it.parent as? ViewGroup)?.removeView(it) }
+                ?: FragmentContainerView(context)
+                    .apply { id = viewId }
+                    .also {
+                        fragmentManager.beginTransaction().replace(viewId, fragment, tag).commitNowAllowingStateLoss()
+                    }
         },
         update = {
-            val fragmentAlreadyAdded = fragmentManager.findFragmentByTag(tag) != null
-
-            if (!fragmentAlreadyAdded) {
-                fragmentManager.beginTransaction().replace(it.id, fragment, tag).commit()
-            }
         }
     )
 }
diff --git a/earn/presentation/src/main/java/com/blockchain/earn/dashboard/EarnDashboardFragment.kt b/earn/presentation/src/main/java/com/blockchain/earn/dashboard/EarnDashboardFragment.kt
@@ -65,7 +65,7 @@ class EarnDashboardFragment :
 
     private val viewModel by viewModel<EarnDashboardViewModel>()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return ComposeView(requireContext()).apply {
             setContent {
                 bindViewModel(viewModel, this@EarnDashboardFragment, ModelConfigArgs.NoArgs)

diff --git a/earn/presentation/src/main/java/com/blockchain/earn/dashboard/EarnDashboardScreen.kt b/earn/presentation/src/main/java/com/blockchain/earn/dashboard/EarnDashboardScreen.kt
@@ -566,6 +566,6 @@ fun EarnKycRequired(fm: FragmentManager) {
         modifier = Modifier.fillMaxSize(),
         fragment = KycUpgradeNowSheet.newInstance(),
         fragmentManager = fm,
-        tag = "KycNow"
+        tag = "EarnDashboardKyc"
     )
 }