Release 2.6.0 (#70)

Author: alien190

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 2.6.0
+
+- **BREAKING** [Android] `ApphudListener.apphudDidReceivePurchase` method was introduced
+- **BREAKING** [iOS], [Android] `paywalls` method was removed
+- **BREAKING** [iOS] `rawPaywalls` method was removed
+- [Android] `ApphudNonRenewingPurchase.purchaseToken` property was introduced
+- [Android] `ApphudSubscription.purchaseToken` property was introduced
+- [Android], [iOS] `deferPlacements` method was introduced
+- [Android] `refreshUserData` method was introduced
+- [Android], [iOS] `forceFlushUserProperties` method was introduced
+- [Android]  `refreshUserData` now returns `ApphudUser?`
+- [Android]  `updateUserID` now returns `ApphudUser?`
+- [Android], [iOS] `attributeFromWeb` method was introduced
+
+- Dependencies of Native SDK's were updated to:
+  - [Android] 2.8.3
+  - [iOS] 3.5.6
+
 ## 2.5.4
 
 - [iOS],[Android] `ApphudAttributionProvider.facebook` was added.

android/build.gradle

@@ -53,7 +53,7 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "com.apphud:ApphudSDK-Android:2.7.0"
+    implementation 'com.apphud:ApphudSDK-Android:2.8.3'
     implementation 'com.android.billingclient:billing:6.1.0'
     implementation 'com.google.code.gson:gson:2.8.8'
 }

android/src/main/kotlin/com/apphud/fluttersdk/ApphudPlugin.kt

@@ -128,7 +128,7 @@ class ApphudPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
 
     private fun setHeaders() {
         HeadersInterceptor.X_SDK = "Flutter"
-        HeadersInterceptor.X_SDK_VERSION = "2.5.4"
+        HeadersInterceptor.X_SDK_VERSION = "2.6.0"
     }
 
     override fun onDetachedFromActivityForConfigChanges() {

android/src/main/kotlin/com/apphud/fluttersdk/Extensions.kt

@@ -97,7 +97,8 @@ fun ApphudNonRenewingPurchase.toMap(): HashMap<String, Any?> {
         "productId" to productId,
         "purchasedAt" to purchasedAt,
         "canceledAt" to canceledAt,
-        "isActive" to isActive()
+        "isActive" to isActive(),
+        "purchaseToken" to purchaseToken
     )
 }
 
@@ -111,14 +112,15 @@ fun ApphudSubscription.toMap(): HashMap<String, Any?> {
         "isAutorenewEnabled" to isAutoRenewEnabled,
         "isIntroductoryActivated" to isIntroductoryActivated,
         "isActive" to isActive(),
-        "status" to status.name.lowercase(Locale.ROOT)
+        "status" to status.name.lowercase(Locale.ROOT),
+        "purchaseToken" to purchaseToken
     )
 }
 
 fun ApphudGroup.toMap(): HashMap<String, Any?> {
     return hashMapOf(
         "name" to name,
-        "productIds" to ((products?.map { it.productId }) ?: listOf()),
+        "productIds" to productIds(),
         "hasAccess" to hasAccess()
     )
 }

android/src/main/kotlin/com/apphud/fluttersdk/FlutterSdkCommon.kt

@@ -2,20 +2,25 @@ package com.apphud.fluttersdk
 
 import com.apphud.sdk.Apphud
 import com.apphud.sdk.domain.ApphudPaywall
-
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
 
 object FlutterSdkCommon {
     public suspend fun getPaywall(
         paywallIdentifier: String?,
         placementIdentifier: String?
     ): ApphudPaywall? {
-        val foundPaywall: ApphudPaywall? = if (placementIdentifier != null) {
+        return if (placementIdentifier != null) {
             val placements = Apphud.placements()
             placements.firstOrNull { it.identifier == placementIdentifier }?.paywall
         } else if (paywallIdentifier != null) {
-            val paywalls = Apphud.paywalls()
-            paywalls.firstOrNull { it.identifier == paywallIdentifier }
+            suspendCancellableCoroutine { cont ->
+                Apphud.paywallsDidLoadCallback { paywalls, _ ->
+                    val paywall = paywalls.firstOrNull { it.identifier == paywallIdentifier }
+                    cont.resume(paywall)
+                }
+            }
         } else null
-        return foundPaywall
     }
 }

android/src/main/kotlin/com/apphud/fluttersdk/handlers/ApphudListenerHandler.kt

@@ -1,6 +1,7 @@
 package com.apphud.fluttersdk.handlers
 
 import com.android.billingclient.api.ProductDetails
+import com.android.billingclient.api.Purchase
 import com.apphud.fluttersdk.toMap
 import com.apphud.sdk.Apphud
 import com.apphud.sdk.ApphudListener
@@ -25,6 +26,7 @@ class ApphudListenerHandler(handleOnMainThreadP: HandleOnMainThread) :
     private var subscriptionsCached: List<ApphudSubscription>? = null
     private var purchasesCached: List<ApphudNonRenewingPurchase>? = null
     private var placementsCached: List<ApphudPlacement>? = null
+    private var purchaseCached: Purchase? = null
     private var handleOnMainThread = handleOnMainThreadP
 
     init {
@@ -65,6 +67,7 @@ class ApphudListenerHandler(handleOnMainThreadP: HandleOnMainThread) :
         subscriptionsCached?.let { v -> apphudSubscriptionsUpdated(v) }
         purchasesCached?.let { v -> apphudNonRenewingPurchasesUpdated(v) }
         placementsCached?.let { v -> placementsDidFullyLoad(v) }
+        purchaseCached?.let { v -> apphudDidReceivePurchase(v) }
     }
 
     private fun stop() {
@@ -80,6 +83,15 @@ class ApphudListenerHandler(handleOnMainThreadP: HandleOnMainThread) :
         }
     }
 
+    override fun apphudDidReceivePurchase(purchase: Purchase) {
+        purchaseCached = purchase
+        if(isListeningStarted) {
+            handleOnMainThread {
+                channel?.invokeMethod("apphudDidReceivePurchase", purchase.toMap())
+            }
+        }
+    }
+
 
     override fun apphudFetchProductDetails(details: List<ProductDetails>) {
         detailsCached = details

android/src/main/kotlin/com/apphud/fluttersdk/handlers/AttributionHandler.kt

@@ -1,5 +1,6 @@
 package com.apphud.fluttersdk.handlers
 
+import com.apphud.fluttersdk.toMap
 import com.apphud.sdk.Apphud
 import com.apphud.sdk.ApphudAttributionProvider
 import io.flutter.plugin.common.MethodChannel
@@ -19,7 +20,24 @@ class AttributionHandler(
             AttributionRoutes.addAttribution.name -> AttributionParser(result).parse(args) { provider, data, identifier ->
                 addAttribution(provider, data, identifier, result)
             }
+
             AttributionRoutes.collectSearchAdsAttribution.name -> result.notImplemented()
+            AttributionRoutes.attributeFromWeb.name -> AttributeFromWebParser(result).parse(args) { data ->
+                attributeFromWeb(data, result)
+            }
+        }
+    }
+
+    private fun attributeFromWeb(data: Map<String, Any>?, result: MethodChannel.Result) {
+        if (data == null) {
+            result.success({ "wasSuccessful" to false })
+            return
+        }
+        Apphud.attributeFromWeb(data) { wasSuccessful, user ->
+            val resultMap = hashMapOf<String, Any?>()
+            resultMap["wasSuccessful"] = wasSuccessful
+            resultMap["user"] = user?.toMap()
+            handleOnMainThread { result.success(resultMap) }
         }
     }
 
@@ -69,12 +87,33 @@ class AttributionHandler(
             }
         }
     }
+
+    class AttributeFromWebParser(val result: MethodChannel.Result) {
+        fun parse(
+            args: Map<String, Any>?, callback: (
+                data: Map<String, Any>?,
+            ) -> Unit
+        ) {
+            try {
+                if (args == null) {
+                    callback(null)
+                } else {
+                    val data = args as? Map<String, Any>?
+                    callback(data)
+                }
+            } catch (e: IllegalArgumentException) {
+                result.error("400", e.message, "")
+            }
+        }
+    }
 }
 
+
 enum class AttributionRoutes {
 
     addAttribution,
-    collectSearchAdsAttribution;
+    collectSearchAdsAttribution,
+    attributeFromWeb;
 
     companion object Mapper {
         fun stringValues(): List<String> {

android/src/main/kotlin/com/apphud/fluttersdk/handlers/HandlePurchasesHandler.kt

@@ -27,6 +27,13 @@ class HandlePurchasesHandler(
 
             HandlePurchasesRoutes.restorePurchases.name -> restorePurchases(result)
             HandlePurchasesRoutes.hasPremiumAccess.name -> hasPremiumAccess(result)
+            HandlePurchasesRoutes.refreshUserData.name -> refreshUserData(result)
+        }
+    }
+
+    private fun refreshUserData(result: MethodChannel.Result) {
+        Apphud.refreshUserData { user ->
+            handleOnMainThread { result.success(user?.toMap()) }
         }
     }
 
@@ -118,7 +125,8 @@ enum class HandlePurchasesRoutes {
     nonRenewingPurchases,
     isNonRenewingPurchaseActive,
     restorePurchases,
-    hasPremiumAccess;
+    hasPremiumAccess,
+    refreshUserData;
 
     companion object Mapper {
         fun stringValues(): List<String> {

android/src/main/kotlin/com/apphud/fluttersdk/handlers/InitializationHandler.kt

@@ -63,8 +63,9 @@ class InitializationHandler(
     }
 
     private fun updateUserID(userId: String, result: MethodChannel.Result) {
-        Apphud.updateUserId(userId = userId)
-        handleOnMainThread { result.success(null) }
+        Apphud.updateUserId(userId = userId) {  user ->
+            handleOnMainThread { result.success(user?.toMap()) }
+        }
     }
 
     private fun userID(result: MethodChannel.Result) {

android/src/main/kotlin/com/apphud/fluttersdk/handlers/MakePurchaseHandler.kt

@@ -6,9 +6,7 @@ import com.apphud.fluttersdk.FlutterSdkCommon
 import com.apphud.fluttersdk.toApphudProduct
 import com.apphud.fluttersdk.toMap
 import com.apphud.sdk.Apphud
-import com.apphud.sdk.ApphudError
 import com.apphud.sdk.ApphudPurchaseResult
-import com.apphud.sdk.domain.ApphudPaywall
 import com.apphud.sdk.domain.ApphudProduct
 import com.apphud.sdk.flutter.ApphudFlutter
 import io.flutter.plugin.common.MethodChannel
@@ -51,8 +49,6 @@ class MakePurchaseHandler(
 
             MakePurchaseRoutes.getPaywalls.name -> result.notImplemented()
 
-            MakePurchaseRoutes.paywalls.name -> paywalls(result)
-
             MakePurchaseRoutes.paywallsDidLoadCallback.name -> paywallsDidLoadCallback(result)
 
             MakePurchaseRoutes.purchaseProduct.name -> PurchaseProductParser(result).parse(args)
@@ -66,7 +62,7 @@ class MakePurchaseHandler(
                 )
             }
 
-            MakePurchaseRoutes.permissionGroups.name -> getPermissionGroups(result)
+            MakePurchaseRoutes.permissionGroups.name -> permissionGroups(result)
 
             MakePurchaseRoutes.rawPaywalls.name -> rawPaywalls(result)
 
@@ -84,20 +80,20 @@ class MakePurchaseHandler(
                     result
                 )
             }
+
+            MakePurchaseRoutes.deferPlacements.name -> deferPlacements(result)
         }
     }
 
-    private fun getPermissionGroups(result: MethodChannel.Result) {
-        val groups = Apphud.permissionGroups()
-        handleOnMainThread { result.success(groups.map { it.toMap() }) }
+    private fun deferPlacements(result: MethodChannel.Result) {
+        Apphud.deferPlacements()
+        handleOnMainThread { result.success(null) }
     }
 
-    private fun paywalls(result: MethodChannel.Result) {
+    private fun permissionGroups(result: MethodChannel.Result) {
         GlobalScope.launch {
-            val paywalls: List<ApphudPaywall> = Apphud.paywalls()
-            val resultMap = hashMapOf<String, Any?>()
-            resultMap["paywalls"] = paywalls.map { paywall -> paywall.toMap() }
-            handleOnMainThread { result.success(resultMap) }
+            val groups = Apphud.fetchPermissionGroups()
+            handleOnMainThread { result.success(groups.map { it.toMap() }) }
         }
     }
 
@@ -346,14 +342,14 @@ enum class MakePurchaseRoutes {
     syncPurchasesInObserverMode,
     presentOfferCodeRedemptionSheet,
     getPaywalls,
-    paywalls,
     purchaseProduct,
     permissionGroups,
     paywallsDidLoadCallback,
     rawPaywalls,
     refreshUserData,
     loadFallbackPaywalls,
-    trackPurchase;
+    trackPurchase,
+    deferPlacements;
 
     companion object Mapper {
         fun stringValues(): List<String> {