Skip to content

Migrate to Google Play Billing Library 7.1.1 #523

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

Open
spuday90 wants to merge 1 commit into
base: refactor-lambda-function
Choose a base branch
from
Open

Migrate to Google Play Billing Library 7.1.1 #523

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
35 changes: 33 additions & 2 deletions app/src/GooglePlay/java/com/parishod/watomatic/billing/BillingManagerImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import com.parishod.watomatic.backend.BackendService
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.delay

class BillingManagerImpl(private val context: Context) : BillingManager, PurchasesUpdatedListener {

Expand All @@ -24,14 +25,22 @@ class BillingManagerImpl(private val context: Context) : BillingManager, Purchas

private var billingClient: BillingClient = BillingClient.newBuilder(context)
.setListener(this)
.enablePendingPurchases(PendingPurchasesParams.newBuilder().enableOneTimeProducts().build())
.enablePendingPurchases(
PendingPurchasesParams.newBuilder()
.enableOneTimeProducts()
.enablePrepaidPlans()
.build()
)
.build()

private var purchaseListener: PurchaseUpdateListener? = null
private var isConnected = false
private val productDetailsCache = mutableMapOf<String, ProductDetails>()
private val backendService: BackendService = FirebaseBackendService(context)

private var connectionAttempt = 0
private val maxConnectionAttempts = 3

override fun startConnection(onConnected: (() -> Unit)?, onDisconnected: (() -> Unit)?) {
if (isConnected) {
onConnected?.invoke()
Expand All @@ -42,6 +51,7 @@ class BillingManagerImpl(private val context: Context) : BillingManager, Purchas
override fun onBillingSetupFinished(billingResult: BillingResult) {
if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
isConnected = true
connectionAttempt = 0
Log.d(TAG, "Billing client connected successfully")
onConnected?.invoke()
} else {
Expand All @@ -54,7 +64,20 @@ class BillingManagerImpl(private val context: Context) : BillingManager, Purchas
override fun onBillingServiceDisconnected() {
isConnected = false
Log.w(TAG, "Billing service disconnected")
onDisconnected?.invoke()

if (connectionAttempt < maxConnectionAttempts) {
connectionAttempt++
val backoffTime = (Math.pow(2.0, connectionAttempt.toDouble()) * 1000).toLong() // 2s, 4s, 8s
Log.d(TAG, "Retrying billing connection in ${backoffTime}ms (attempt $connectionAttempt of $maxConnectionAttempts)...")

CoroutineScope(Dispatchers.Main).launch {
delay(backoffTime)
startConnection(onConnected, onDisconnected)
}
} else {
Log.e(TAG, "Max connection attempts reached. Could not connect to billing service.")
onDisconnected?.invoke()
}
}
})
}
Expand Down Expand Up @@ -228,6 +251,14 @@ class BillingManagerImpl(private val context: Context) : BillingManager, Purchas
}
)
}
BillingClient.BillingResponseCode.NETWORK_ERROR -> {
Log.e(TAG, "Network error during purchase")
purchaseListener?.onPurchaseFailure("Network error. Please check your internet connection.")
}
BillingClient.BillingResponseCode.SERVICE_UNAVAILABLE -> {
Log.e(TAG, "Service unavailable during purchase")
purchaseListener?.onPurchaseFailure("Service unavailable. Please try again later.")
}
else -> {
val errorMsg = "Purchase failed: ${billingResult.debugMessage}"
Log.e(TAG, errorMsg)
Expand Down
Loading