Upgrade to billing 6.0.1

d4rken-org · Jul 5, 2023 · f990a7f · f990a7f
1 parent 24add8c
commit f990a7f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -177,7 +177,7 @@ dependencies {
 
     implementation("io.coil-kt:coil:2.0.0-rc02")
 
-    "gplayImplementation"("com.android.billingclient:billing:4.0.0")
+    "gplayImplementation"("com.android.billingclient:billing:6.0.1")
 
     // Support libs
     implementation("androidx.core:core-ktx:1.8.0")

diff --git a/app/src/gplay/java/eu/darken/myperm/common/upgrade/core/client/BillingClientConnection.kt b/app/src/gplay/java/eu/darken/myperm/common/upgrade/core/client/BillingClientConnection.kt
@@ -1,7 +1,13 @@
 package eu.darken.myperm.common.upgrade.core.client
 
 import android.app.Activity
-import com.android.billingclient.api.*
+import com.android.billingclient.api.AcknowledgePurchaseParams
+import com.android.billingclient.api.BillingClient
+import com.android.billingclient.api.BillingFlowParams
+import com.android.billingclient.api.BillingResult
+import com.android.billingclient.api.Purchase
+import com.android.billingclient.api.SkuDetails
+import com.android.billingclient.api.SkuDetailsParams
 import eu.darken.myperm.common.debug.logging.Logging.Priority.INFO
 import eu.darken.myperm.common.debug.logging.Logging.Priority.WARN
 import eu.darken.myperm.common.debug.logging.log
@@ -22,7 +28,7 @@ data class BillingClientConnection(
     val purchases: Flow<Collection<Purchase>> = combine(purchasesGlobal, purchasesLocal) { global, local ->
         val combined = mutableMapOf<String, Purchase>()
         global.plus(local).toSet().sortedByDescending { it.purchaseTime }.forEach { purchase ->
-            combined[purchase.orderId] = purchase
+            combined[purchase.orderId!!] = purchase
         }
         combined.values
     }