Skip to content

Potential fix for google update rejection shenanigans #213

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

Merged
timusus merged 2 commits into from
Jan 17, 2026
+19 −7
Merged

Potential fix for google update rejection shenanigans #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcb03ef
Potential fix for google update rejection shenanigans
timusus Jan 17, 2026
20932f6
Merge branch 'main' into rejection-fix
timusus Jan 17, 2026
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
13 changes: 11 additions & 2 deletions ...d/app/src/main/java/com/simplecityapps/shuttle/ui/screens/trial/PurchaseDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.simplecityapps.shuttle.ui.screens.trial

import android.app.Dialog
import android.os.Bundle
import android.widget.Toast
import androidx.core.content.res.ResourcesCompat
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentManager
Expand Down Expand Up @@ -58,8 +59,16 @@ class PurchaseDialogFragment : DialogFragment() {
productDetails,
object : SkuBinder.Listener {
override fun onClick(productDetails: ProductDetails) {
billingManager.launchPurchaseFlow(requireActivity(), productDetails)
dismiss()
val launched = billingManager.launchPurchaseFlow(requireActivity(), productDetails)
if (launched) {
dismiss()
} else {
Toast.makeText(
requireContext(),
"Unable to connect to Google Play. Please try again.",
Toast.LENGTH_SHORT
).show()
}
}
}
)
Expand Down
8 changes: 5 additions & 3 deletions android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/trial/TrialDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ class TrialDialogFragment : DialogFragment() {
var touchTime = 0L
icon.setOnTouchListener { v, event ->
if (event.action == MotionEvent.ACTION_UP) {
if (touchTime == 0L || System.currentTimeMillis() - touchTime > 2000) {
touchTime = System.currentTimeMillis()
val now = System.currentTimeMillis()
if (touchTime == 0L || now - touchTime > 2000) {
touchTime = now
touchCount = 1
} else {
touchCount++
Expand All @@ -60,7 +61,8 @@ class TrialDialogFragment : DialogFragment() {
dismiss()
}
}
true
// Only consume if we're in an active tap sequence
touchCount > 0 && System.currentTimeMillis() - touchTime <= 2000
}

val upgradeButton: Button = view.findViewById(R.id.upgradeButton)
Expand Down
5 changes: 3 additions & 2 deletions android/trial/src/main/java/com/simplecityapps/trial/BillingManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ class BillingManager(
fun launchPurchaseFlow(
activity: FragmentActivity,
productDetails: ProductDetails
) {
): Boolean {
if (!billingClient.isReady) {
Timber.e("Failed to launch purchase flow: BillingClient not ready")
return
return false
}

val productDetailsParamsList = listOf(
Expand All @@ -137,6 +137,7 @@ class BillingManager(
.setProductDetailsParamsList(productDetailsParamsList)
.build()
)
return true
}

suspend fun queryProductDetails() {
Expand Down