Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-15 07:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not check if purchase was within last month.

Browse Source
This commit is contained in:
Alex Hart
2025-06-12 09:51:59 -03:00
committed by Michelle Tang
parent 0ab77e159d
commit 4a1baa75a8
3 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt
View File

@@ -281,7 +281,7 @@ class RemoteBackupsSettingsViewModel : ViewModel() {
val hasActiveGooglePlayBillingSubscription = when (val purchaseResult = AppDependencies.billingApi.queryPurchases()) {
is BillingPurchaseResult.Success -> {
Log.d(TAG, "[subscriptionStateMismatchDetected] Found a purchase: $purchaseResult")
purchaseResult.isAcknowledged && purchaseResult.isWithinTheLastMonth() && purchaseResult.isAutoRenewing
purchaseResult.isAcknowledged && purchaseResult.isAutoRenewing
}
else -> {
Log.d(TAG, "[subscriptionStateMismatchDetected] No purchase found in Google Play Billing: $purchaseResult")

2
app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt
View File

@@ -103,7 +103,7 @@ class BackupSubscriptionCheckJob private constructor(parameters: Parameters) : C
val purchase: BillingPurchaseResult = AppDependencies.billingApi.queryPurchases()
Log.i(TAG, "Retrieved purchase result from Billing api: $purchase")
val hasActivePurchase = purchase is BillingPurchaseResult.Success && purchase.isAcknowledged && purchase.isWithinTheLastMonth()
val hasActivePurchase = purchase is BillingPurchaseResult.Success && purchase.isAcknowledged
val product: BillingProduct? = AppDependencies.billingApi.queryProduct()
if (product == null) {

15
core-util/src/main/java/org/signal/core/util/billing/BillingPurchaseResult.kt
View File

@@ -5,9 +5,6 @@
package org.signal.core.util.billing
import kotlin.time.Duration.Companion.days
import kotlin.time.Duration.Companion.milliseconds
/**
* Sealed class hierarchy representing the different success
* and error states of google play billing purchases.
@@ -21,17 +18,6 @@ sealed interface BillingPurchaseResult {
val isAutoRenewing: Boolean
) : BillingPurchaseResult {
/**
* @return true if purchaseTime is within the last month.
*/
fun isWithinTheLastMonth(): Boolean {
val now = System.currentTimeMillis().milliseconds
val oneMonthAgo = now - 31.days
val purchaseTime = this.purchaseTime.milliseconds
return oneMonthAgo < purchaseTime
}
override fun toString(): String {
return """
BillingPurchaseResult {
@@ -40,7 +26,6 @@ sealed interface BillingPurchaseResult {
purchaseTime: $purchaseTime
isAcknowledged: $isAcknowledged
isAutoRenewing: $isAutoRenewing
isWithinTheLastMonth: ${isWithinTheLastMonth()}
}
""".trimIndent()
}