Attempt to fix processing of old, unrelated checkouts (#152)

Author: cmaier

CHANGELOG.md

@@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file.
 ### Changed
 ### Removed
 ### Fixed
+* core: Attempt to fix bug where old checkout processes has been processed
+  * The saved checkout is only used if it's related to the current cart
 
 ## [0.71.2]
 ### Added

core/src/main/java/io/snabble/sdk/checkout/Checkout.kt

@@ -26,7 +26,11 @@ class Checkout @JvmOverloads constructor(
     }
 
     private var persistentState: PersistentState =
-        PersistentState.restore(File(project.internalStorageDirectory, "checkout.json"))
+        PersistentState.restore(
+            file = File(project.internalStorageDirectory, "checkout.json"),
+            cartId = shoppingCart.id,
+            projectId = project.id
+        )
 
     /** The current checkout process response from the backend **/
     var checkoutProcess

core/src/main/java/io/snabble/sdk/checkout/PersistentState.kt

@@ -1,17 +1,18 @@
 package io.snabble.sdk.checkout
 
-import io.snabble.sdk.coupons.Coupon
 import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.Product
+import io.snabble.sdk.coupons.Coupon
+import io.snabble.sdk.events.Events
 import io.snabble.sdk.utils.Dispatch
 import io.snabble.sdk.utils.GsonHolder
 import io.snabble.sdk.utils.Logger
 import java.io.File
-import java.lang.Exception
 
-data class PersistentState (
+data class PersistentState(
     @Transient
     var file: File,
+    var cartId: String? = null,
     var checkoutProcess: CheckoutProcessResponse? = null,
     var selectedPaymentMethod: PaymentMethod? = null,
     var priceToPay: Int = 0,
@@ -22,6 +23,7 @@ data class PersistentState (
     var fulfillmentState: List<Fulfillment>? = null,
     var signedCheckoutInfo: SignedCheckoutInfo? = null
 ) {
+
     fun save() {
         val json = GsonHolder.get().toJson(this)
 
@@ -35,16 +37,20 @@ data class PersistentState (
     }
 
     companion object {
-        fun restore(file: File): PersistentState {
-            return try {
-                val text = file.readText()
-                val persistentState = GsonHolder.get().fromJson(text, PersistentState::class.java)
+
+        fun restore(file: File, cartId: String, projectId: String): PersistentState = try {
+            val persistentState = GsonHolder.get()
+                .fromJson(file.readText(), PersistentState::class.java)
+            if (persistentState.cartId == cartId) {
                 persistentState.file = file
                 persistentState
-            } catch (e: Exception) {
-                Logger.d("read exception [${file.parent}]: $e")
-                PersistentState(file)
+            } else {
+                Events.logErrorEvent(projectId, "Tried to restore a check process w/o a matching cart id.")
+                PersistentState(file, cartId = cartId)
             }
+        } catch (e: Exception) {
+            Logger.d("read exception [${file.parent}]: $e")
+            PersistentState(file, cartId = cartId)
         }
     }
 }

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 compileSdk = "33"
 targetSdk = "32"
 minSdk = "21"
-gradlePlugin = "8.0.2"
+gradlePlugin = "8.1.1"
 desugarVersion = "1.1.5"
 okhttpVersion = "4.10.0"
 # @pin always, manually updated to ensure overall dependency support