Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-25 04:06:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't skip cancelled google purchase when checking subscription state in check job.

Browse Source
This commit is contained in:
Alex Hart
2025-06-09 16:21:29 -03:00
committed by Greyson Parrelli
parent dd5941b884
commit 3588d646d2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,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() && purchase.isAutoRenewing
val hasActivePurchase = purchase is BillingPurchaseResult.Success && purchase.isAcknowledged && purchase.isWithinTheLastMonth()
val product: BillingProduct? = AppDependencies.billingApi.queryProduct()
if (product == null) {

4
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt
View File

@@ -20,7 +20,7 @@ class LogSectionRemoteBackups : LogSection {
override fun getContent(context: Context): CharSequence {
val output = StringBuilder()
output.append("-- Backup State")
output.append("-- Backup State\n")
output.append("Enabled: ${SignalStore.backup.areBackupsEnabled}\n")
output.append("Current tier: ${SignalStore.backup.backupTier}\n")
output.append("Latest tier: ${SignalStore.backup.latestBackupTier}\n")
@@ -35,7 +35,7 @@ class LogSectionRemoteBackups : LogSection {
output.append("Backup frequency: ${SignalStore.backup.backupFrequency.name}\n")
output.append("Optimize storage: ${SignalStore.backup.optimizeStorage}\n")
output.append("Detected subscription state mismatch: ${SignalStore.backup.subscriptionStateMismatchDetected}\n")
output.append("\n -- Subscription State")
output.append("\n -- Subscription State\n")
val backupSubscriptionId = InAppPaymentsRepository.getSubscriber(InAppPaymentSubscriberRecord.Type.BACKUP)
val hasGooglePlayBilling = runBlocking { AppDependencies.billingApi.isApiAvailable() }