Fix checks in backup subscription check job.

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt

@@ -259,6 +259,7 @@ class MessageBackupsFlowViewModel(
       val inAppPayment = SignalDatabase.inAppPayments.getById(inAppPaymentId)!!
       SignalDatabase.inAppPayments.update(
         inAppPayment.copy(
+          state = InAppPaymentTable.State.PENDING,
           subscriberId = InAppPaymentsRepository.requireSubscriber(InAppPaymentSubscriberRecord.Type.BACKUP).subscriberId,
           data = inAppPayment.data.copy(
             redemption = inAppPayment.data.redemption!!.copy(

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

@@ -78,12 +78,6 @@ class BackupSubscriptionCheckJob private constructor(parameters: Parameters) : C
       return Result.success()
     }
 
-    if (!SignalStore.backup.areBackupsEnabled) {
-      Log.i(TAG, "Backups are not enabled on this device. Clearing mismatch value and exiting.")
-      SignalStore.backup.subscriptionStateMismatchDetected = false
-      return Result.success()
-    }
-
     if (!AppDependencies.billingApi.isApiAvailable()) {
       Log.i(TAG, "Google Play Billing API is not available on this device. Clearing mismatch value and exiting.")
       SignalStore.backup.subscriptionStateMismatchDetected = false
@@ -91,6 +85,8 @@ 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 product: BillingProduct? = AppDependencies.billingApi.queryProduct()
 

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

@@ -29,7 +29,20 @@ sealed interface BillingPurchaseResult {
       val oneMonthAgo = now - 31.days
       val purchaseTime = this.purchaseTime.milliseconds
 
-      return oneMonthAgo >= purchaseTime
+      return oneMonthAgo < purchaseTime
+    }
+
+    override fun toString(): String {
+      return """
+        BillingPurchaseResult {
+          purchaseState: $purchaseState
+          purchaseToken: <redacted>
+          purchaseTime: $purchaseTime
+          isAcknowledged: $isAcknowledged
+          isAutoRenewing: $isAutoRenewing
+          isWithinTheLastMonth: ${isWithinTheLastMonth()}
+        }
+      """.trimIndent()
     }
   }
   data object UserCancelled : BillingPurchaseResult