Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handling isCancelled flag on purchase for Android #27

Merged
merged 1 commit into from
Aug 29, 2022
Merged

Handling isCancelled flag on purchase for Android #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions android/sandwich/src/main/kotlin/io/qonversion/sandwich/PurchaseResultListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package io.qonversion.sandwich

interface PurchaseResultListener {

fun onSuccess(data: Map<String, Any?>)

fun onError(error: SandwichError, isCancelled: Boolean)
}
44 changes: 27 additions & 17 deletions android/sandwich/src/main/kotlin/io/qonversion/sandwich/QonversionSandwich.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.qonversion.sandwich

import android.app.Application
import android.util.Log
import androidx.preference.PreferenceManager
import com.qonversion.android.sdk.*
import com.qonversion.android.sdk.dto.QLaunchResult
Expand Down Expand Up @@ -65,32 +64,32 @@ class QonversionSandwich(

// region Product Center

fun purchase(productId: String, resultListener: ResultListener) {
fun purchase(productId: String, resultListener: PurchaseResultListener) {
val currentActivity = activityProvider.currentActivity
?: run {
resultListener.onError(noActivityForPurchaseError.toSandwichError())
resultListener.onError(noActivityForPurchaseError.toSandwichError(), false)
return
}

val permissionsCallback = getPermissionsCallback(resultListener)
Qonversion.purchase(currentActivity, productId, permissionsCallback)
val purchaseCallback = getPurchaseCallback(resultListener)
Qonversion.purchase(currentActivity, productId, purchaseCallback)
}

fun purchaseProduct(
productId: String,
offeringId: String?,
resultListener: ResultListener
resultListener: PurchaseResultListener
) {
val currentActivity = activityProvider.currentActivity
?: run {
resultListener.onError(noActivityForPurchaseError.toSandwichError())
resultListener.onError(noActivityForPurchaseError.toSandwichError(), false)
return
}

val permissionsCallback = getPermissionsCallback(resultListener)
val purchaseCallback = getPurchaseCallback(resultListener)
loadProduct(productId, offeringId, object : ProductCallback {
override fun onProductLoaded(product: QProduct) {
Qonversion.purchase(currentActivity, product, permissionsCallback)
Qonversion.purchase(currentActivity, product, purchaseCallback)
}

override fun onLoadingFailed() {
Expand All @@ -103,35 +102,35 @@ class QonversionSandwich(
productId: String,
oldProductId: String,
prorationMode: Int?,
resultListener: ResultListener
resultListener: PurchaseResultListener
) {
val currentActivity = activityProvider.currentActivity
?: run {
resultListener.onError(noActivityForPurchaseError.toSandwichError())
resultListener.onError(noActivityForPurchaseError.toSandwichError(), false)
return
}

val permissionsCallback = getPermissionsCallback(resultListener)
Qonversion.updatePurchase(currentActivity, productId, oldProductId, prorationMode, permissionsCallback)
val purchaseCallback = getPurchaseCallback(resultListener)
Qonversion.updatePurchase(currentActivity, productId, oldProductId, prorationMode, purchaseCallback)
}

fun updatePurchaseWithProduct(
productId: String,
offeringId: String?,
oldProductId: String,
prorationMode: Int?,
resultListener: ResultListener
resultListener: PurchaseResultListener
) {
val currentActivity = activityProvider.currentActivity
?: run {
resultListener.onError(noActivityForPurchaseError.toSandwichError())
resultListener.onError(noActivityForPurchaseError.toSandwichError(), false)
return
}

val permissionsCallback = getPermissionsCallback(resultListener)
val purchaseCallback = getPurchaseCallback(resultListener)
loadProduct(productId, offeringId, object : ProductCallback {
override fun onProductLoaded(product: QProduct) {
Qonversion.updatePurchase(currentActivity, product, oldProductId, prorationMode, permissionsCallback)
Qonversion.updatePurchase(currentActivity, product, oldProductId, prorationMode, purchaseCallback)
}

override fun onLoadingFailed() {
Expand Down Expand Up @@ -324,5 +323,16 @@ class QonversionSandwich(
}
}

private fun getPurchaseCallback(resultListener: PurchaseResultListener) = object : QonversionPermissionsCallback {
override fun onSuccess(permissions: Map<String, QPermission>) {
resultListener.onSuccess(permissions.toPermissionsMap())
}

override fun onError(error: QonversionError) {
val isCancelled = error.code == QonversionErrorCode.CanceledPurchase
resultListener.onError(error.toSandwichError(), isCancelled)
}
}

// endregion
}