Merge pull request #10 from apphud/development

fix subscriptions not updating immediately after purchase or restore
apphud · Apr 6, 2021 · cc9a814 · cc9a814
2 parents 25b16a1 + db765f0
commit cc9a814
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/app/src/main/java/com/apphud/app/App.kt b/app/src/main/java/com/apphud/app/App.kt
@@ -1,6 +1,7 @@
 package com.apphud.app
 
 import android.app.Application
+import android.util.Log
 import com.apphud.sdk.Apphud
 
 class App : Application() {
@@ -14,7 +15,6 @@ class App : Application() {
         app = this
 
         Apphud.enableDebugLogs()
-//        Apphud.disableAdTracking()
         Apphud.start(this, Constants.API_KEY)
     }
 }
diff --git a/app/src/main/java/com/apphud/app/Constants.kt b/app/src/main/java/com/apphud/app/Constants.kt
@@ -1,5 +1,5 @@
 package com.apphud.app
 
 object Constants {
-    const val API_KEY = "app_EzgZvMy2qRcSsU2uRuDxd9GaqU8BCV"
+    const val API_KEY = "app_DZzKAkuBWhe9nz3qeofJMU9PJezkxn"
 }
diff --git a/app/src/main/java/com/apphud/app/MainActivity.kt b/app/src/main/java/com/apphud/app/MainActivity.kt
@@ -29,6 +29,8 @@ class MainActivity : AppCompatActivity() {
         val listener = object : ApphudListener {
             override fun apphudSubscriptionsUpdated(subscriptions: List<ApphudSubscription>) {
 
+                Log.d("apphud","SUBSCRIPTIONS UPDATED: ${Apphud.subscriptions() }. Has active subscription: ${Apphud.hasActiveSubscription()}")
+
                 subscriptions.forEach { subscription ->
                     val model = when (val product = products[subscription.productId]) {
                         null -> mapper.map(subscription)
@@ -68,7 +70,9 @@ class MainActivity : AppCompatActivity() {
             Log.e("Apphud", "onClick model: $model")
             when (model.details) {
                 null -> Log.e("Apphud", "details is empty")
-                else -> Apphud.purchase(this, model.details) { _ -> }
+                else -> Apphud.purchase(this, model.details) { _ ->
+                    Log.d("apphud","PURCHASE RESULT: ${Apphud.subscriptions() }. Has active subscription: ${Apphud.hasActiveSubscription()}")
+                }
             }
         }
 

diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,4 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
-sdkVersion=0.8.3
+sdkVersion=0.8.5
diff --git a/sdk/src/main/java/com/apphud/sdk/ApphudInternal.kt b/sdk/src/main/java/com/apphud/sdk/ApphudInternal.kt
@@ -216,13 +216,13 @@ internal object ApphudInternal {
 
             client.purchased(mkPurchasesBody(purchases)) { customer ->
                 handler.post {
+                    storage.customer = customer
+                    callback.invoke(purchases.map { it.purchase })
                     apphudListener?.apphudSubscriptionsUpdated(customer.subscriptions)
                     apphudListener?.apphudNonRenewingPurchasesUpdated(customer.purchases)
                 }
             }
 
-            callback.invoke(purchases.map { it.purchase })
-
             purchases.forEach {
 
                 when (it.purchase.purchaseState) {
@@ -244,14 +244,16 @@ internal object ApphudInternal {
         storage.isNeedSync = true
         billing.restoreCallback = { records ->
 
-            ApphudLog.log("syncPurchases: $records")
+            ApphudLog.log("restoreCallback: $records")
 
             when {
                 prevPurchases.containsAll(records) -> ApphudLog.log("syncPurchases: Don't send equal purchases from prev state")
                 else                               -> client.purchased(mkPurchaseBody(records)) { customer ->
                     handler.post {
                         prevPurchases.addAll(records)
                         storage.isNeedSync = false
+                        storage.customer = customer
+                        ApphudLog.log("syncPurchases: customer updated $customer")
                         apphudListener?.apphudSubscriptionsUpdated(customer.subscriptions)
                         apphudListener?.apphudNonRenewingPurchasesUpdated(customer.purchases)
                     }
@@ -260,7 +262,7 @@ internal object ApphudInternal {
             }
         }
         billing.historyCallback = { purchases ->
-            ApphudLog.log("syncPurchases: history purchases: $purchases")
+            ApphudLog.log("historyCallback: $purchases")
             billing.restore(BillingClient.SkuType.SUBS, purchases)
             billing.restore(BillingClient.SkuType.INAPP, purchases)
         }