From 3588d646d219f916b021fbbf225159c6a064e210 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 9 Jun 2025 16:21:29 -0300 Subject: [PATCH] Don't skip cancelled google purchase when checking subscription state in check job. --- .../thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt | 2 +- .../securesms/logsubmit/LogSectionRemoteBackups.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt index 8d51940517..c16fafb7bf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt @@ -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) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt index 773605cf1a..6720c5e51f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt @@ -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() }