From f8d40bf86d09e3fad8d1bf9489844f455dfef165 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 27 Feb 2026 17:02:15 -0400 Subject: [PATCH] Revert "Don't show 'Payment Pending' during backup subscription keep-alive flows." This reverts commit e87aa22d32b3e5f8aff28b6ac04ab1a306cca654. --- .../components/settings/app/backups/BackupStateObserver.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupStateObserver.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupStateObserver.kt index aa33a77faf..6485203cfc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupStateObserver.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupStateObserver.kt @@ -166,8 +166,7 @@ class BackupStateObserver( } val price = latestPayment.data.amount!!.toFiatMoney() - val isKeepAlive = latestPayment.data.redemption?.keepAlive == true - val isPending = latestPayment.state == InAppPaymentTable.State.PENDING && !isKeepAlive + val isPending = SignalDatabase.inAppPayments.hasPendingBackupRedemption() if (isPending) { Log.d(TAG, "[getDatabaseBackupState] We have a pending subscription.") return BackupState.Pending(price = price) @@ -243,8 +242,7 @@ class BackupStateObserver( * Utilizes everything we can to resolve the most accurate backup state available, including database and network. */ private suspend fun getNetworkBackupState(lastPurchase: InAppPaymentTable.InAppPayment?): BackupState { - val isKeepAlive = lastPurchase?.data?.redemption?.keepAlive == true - if (lastPurchase?.state == InAppPaymentTable.State.PENDING && !isKeepAlive) { + if (lastPurchase?.state == InAppPaymentTable.State.PENDING) { Log.d(TAG, "[getNetworkBackupState] We have a pending subscription.") return BackupState.Pending( price = lastPurchase.data.amount!!.toFiatMoney()