Fix crash due to multiple fragment transactions (#253)

Fabtron · web-flow · commit cd3406e260cf · 2025-06-23T16:43:32.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ All notable changes to this project will be documented in this file.
 ### Removed
 ### Fixed
 
+## [0.80.17]
+### Changed
+* core / ui: replace headless fragment with different result launcher for google pay
+
 ## [0.80.16]
 ### Added
 * core: Add support for different time formats in the receipts API 
diff --git a/core/src/main/java/io/snabble/sdk/googlepay/GooglePayHelper.kt b/core/src/main/java/io/snabble/sdk/googlepay/GooglePayHelper.kt
@@ -183,7 +183,7 @@ class GooglePayHelper(
         val priceToPayDecimal = priceToPay.toBigDecimal().divide(100.toBigDecimal())
         val task = getLoadPaymentDataTask(priceToPayDecimal.toString())
         task.addOnCompleteListener {
-            paymentDataLauncher!!.launch(it)
+            paymentDataLauncher?.launch(it)
         }
 
         return false
diff --git a/core/src/main/java/io/snabble/sdk/googlepay/HeadlessGooglePlayFragment.kt b/core/src/main/java/io/snabble/sdk/googlepay/HeadlessGooglePlayFragment.kt
diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt b/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt
@@ -1,14 +1,9 @@
 package io.snabble.sdk.ui.cart
 
-import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.DialogInterface
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
 import android.os.Bundle
 import android.util.AttributeSet
-import android.util.Log
 import android.view.KeyEvent
 import android.view.View
 import android.widget.ArrayAdapter
@@ -18,7 +13,6 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.compose.foundation.layout.add
 import androidx.core.view.isVisible
 import androidx.core.view.marginTop
 import androidx.fragment.app.FragmentActivity
@@ -35,8 +29,6 @@ import io.snabble.sdk.checkout.DepositReturnVoucher
 import io.snabble.sdk.checkout.DepositReturnVoucherState
 import io.snabble.sdk.config.ExternalBillingSubjectLength
 import io.snabble.sdk.config.ProjectId
-import io.snabble.sdk.extensions.getApplicationInfoCompat
-import io.snabble.sdk.googlepay.HeadlessGooglePlayFragment
 import io.snabble.sdk.shoppingcart.ShoppingCart
 import io.snabble.sdk.shoppingcart.data.Taxation
 import io.snabble.sdk.shoppingcart.data.listener.SimpleShoppingCartListener
@@ -81,7 +73,6 @@ open class CheckoutBar @JvmOverloads constructor(
     private val articleCount = findViewById<TextView>(R.id.article_count)
 
     private lateinit var progressDialog: DelayedProgressDialog
-    private var headlessFragment: HeadlessGooglePlayFragment? = null
 
     private val paymentSelectionHelper by lazy { PaymentSelectionHelper.getInstance() }
     private lateinit var project: Project
@@ -110,36 +101,6 @@ open class CheckoutBar @JvmOverloads constructor(
         }
     }
 
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        if (headlessFragment == null) {
-            val fragmentManager = requireFragmentActivity().supportFragmentManager
-            var foundFragment =
-                fragmentManager.findFragmentByTag(HeadlessGooglePlayFragment.TAG) as? HeadlessGooglePlayFragment
-
-            if (foundFragment == null) {
-                foundFragment = HeadlessGooglePlayFragment.newInstance(Snabble.checkedInProject.value?.id)
-                fragmentManager.beginTransaction()
-                    .add(foundFragment, HeadlessGooglePlayFragment.TAG)
-                    .commitNowAllowingStateLoss()
-            }
-            headlessFragment = foundFragment
-        }
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        val activity = requireFragmentActivity()
-        headlessFragment?.let { fragment ->
-            if (!activity.isChangingConfigurations) {
-                activity.supportFragmentManager.beginTransaction()
-                    .remove(fragment)
-                    .commitAllowingStateLoss()
-            }
-        }
-        headlessFragment = null
-    }
-
     private fun initBusinessLogic(project: Project) {
         if (this::project.isInitialized && this.project == project) {
             return
diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutActivity.kt b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutActivity.kt
@@ -3,7 +3,6 @@ package io.snabble.sdk.ui.checkout
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
-import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
@@ -24,17 +23,18 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraph
 import androidx.navigation.NavOptions
 import androidx.navigation.fragment.NavHostFragment
+import com.google.android.gms.wallet.PaymentData
+import com.google.android.gms.wallet.contract.ApiTaskResult
+import com.google.android.gms.wallet.contract.TaskResultContracts
 import com.google.android.material.appbar.MaterialToolbar
 import io.snabble.sdk.InitializationState
 import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.Snabble
 import io.snabble.sdk.checkout.Checkout
 import io.snabble.sdk.checkout.CheckoutState
-import io.snabble.sdk.googlepay.HeadlessGooglePlayFragment
 import io.snabble.sdk.ui.R
 import io.snabble.sdk.ui.remotetheme.onToolBarColorForProject
 import io.snabble.sdk.ui.remotetheme.toolBarColorForProject
-import io.snabble.sdk.ui.utils.requireFragmentActivity
 import io.snabble.sdk.utils.Logger
 
 class CheckoutActivity : FragmentActivity() {
@@ -71,7 +71,22 @@ class CheckoutActivity : FragmentActivity() {
     private lateinit var navGraph: NavGraph
     private lateinit var navController: NavController
     private var checkout: Checkout? = null
-    private var headlessFragment: HeadlessGooglePlayFragment? = null
+
+    init {
+        with(Snabble.checkedInProject.value?.googlePayHelper) {
+            this?.paymentDataLauncher =
+                this@CheckoutActivity.registerForActivityResult(
+                    /* contract = */ TaskResultContracts.GetPaymentDataResult()
+                ) { result: ApiTaskResult<PaymentData?>? ->
+                    result?.let {
+                        onResult(
+                            resultCode = it.status,
+                            paymentData = it.result
+                        )
+                    }
+                }
+        }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -281,34 +296,4 @@ class CheckoutActivity : FragmentActivity() {
             setPopUpTo(currentNavigationId ?: 0, true)
         }.build())
     }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        if (headlessFragment == null) {
-            val fragmentManager = requireFragmentActivity().supportFragmentManager
-            var foundFragment =
-                fragmentManager.findFragmentByTag(HeadlessGooglePlayFragment.TAG) as? HeadlessGooglePlayFragment
-
-            if (foundFragment == null) {
-                foundFragment = HeadlessGooglePlayFragment.newInstance(Snabble.checkedInProject.value?.id)
-                fragmentManager.beginTransaction()
-                    .add(foundFragment, HeadlessGooglePlayFragment.TAG)
-                    .commitNowAllowingStateLoss()
-            }
-            headlessFragment = foundFragment
-        }
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        val activity = requireFragmentActivity()
-        headlessFragment?.let { fragment ->
-            if (!activity.isChangingConfigurations) {
-                activity.supportFragmentManager.beginTransaction()
-                    .remove(fragment)
-                    .commitAllowingStateLoss()
-            }
-        }
-        headlessFragment = null
-    }
 }
diff --git a/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningFragment.kt b/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningFragment.kt
@@ -24,6 +24,9 @@ import androidx.core.view.MenuHost
 import androidx.core.view.MenuProvider
 import androidx.core.view.ViewCompat
 import androidx.lifecycle.Lifecycle
+import com.google.android.gms.wallet.PaymentData
+import com.google.android.gms.wallet.contract.ApiTaskResult
+import com.google.android.gms.wallet.contract.TaskResultContracts
 import com.google.android.material.snackbar.Snackbar
 import io.snabble.accessibility.focusForAccessibility
 import io.snabble.accessibility.isTalkBackActive
@@ -68,6 +71,22 @@ open class SelfScanningFragment : BaseFragment(), MenuProvider {
             }
         }
 
+    init {
+        with(Snabble.checkedInProject.value?.googlePayHelper) {
+            this?.paymentDataLauncher =
+                this@SelfScanningFragment.registerForActivityResult(
+                    /* contract = */ TaskResultContracts.GetPaymentDataResult()
+                ) { result: ApiTaskResult<PaymentData?>? ->
+                    result?.let {
+                        onResult(
+                            resultCode = it.status,
+                            paymentData = it.result
+                        )
+                    }
+                }
+        }
+    }
+
     /**
      * Add a listener to get notified if the camera permission has been granted
      */

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ class GooglePayHelper(`
`183`	`183`	`val priceToPayDecimal = priceToPay.toBigDecimal().divide(100.toBigDecimal())`
`184`	`184`	`val task = getLoadPaymentDataTask(priceToPayDecimal.toString())`
`185`	`185`	`task.addOnCompleteListener {`
`186`		`- paymentDataLauncher!!.launch(it)`
	`186`	`+ paymentDataLauncher?.launch(it)`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`return false`