Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 19:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't show 'Payment Pending' during backup subscription keep-alive flows.

Browse Source
This commit is contained in:
Alex Hart
2025-11-10 12:51:18 -04:00
committed by GitHub
parent ddaabafe44
commit e87aa22d32
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupStateObserver.kt
View File

@@ -166,7 +166,8 @@ class BackupStateObserver(
} }
val price = latestPayment.data.amount!!.toFiatMoney() val price = latestPayment.data.amount!!.toFiatMoney()
val isPending = SignalDatabase.inAppPayments.hasPendingBackupRedemption() val isKeepAlive = latestPayment.data.redemption?.keepAlive == true
val isPending = latestPayment.state == InAppPaymentTable.State.PENDING && !isKeepAlive
if (isPending) { if (isPending) {
Log.d(TAG, "[getDatabaseBackupState] We have a pending subscription.") Log.d(TAG, "[getDatabaseBackupState] We have a pending subscription.")
return BackupState.Pending(price = price) return BackupState.Pending(price = price)
@@ -242,7 +243,8 @@ class BackupStateObserver(
* Utilizes everything we can to resolve the most accurate backup state available, including database and network. * Utilizes everything we can to resolve the most accurate backup state available, including database and network.
*/ */
private suspend fun getNetworkBackupState(lastPurchase: InAppPaymentTable.InAppPayment?): BackupState { private suspend fun getNetworkBackupState(lastPurchase: InAppPaymentTable.InAppPayment?): BackupState {
if (lastPurchase?.state == InAppPaymentTable.State.PENDING) { val isKeepAlive = lastPurchase?.data?.redemption?.keepAlive == true
if (lastPurchase?.state == InAppPaymentTable.State.PENDING && !isKeepAlive) {
Log.d(TAG, "[getNetworkBackupState] We have a pending subscription.") Log.d(TAG, "[getNetworkBackupState] We have a pending subscription.")
return BackupState.Pending( return BackupState.Pending(
price = lastPurchase.data.amount!!.toFiatMoney() price = lastPurchase.data.amount!!.toFiatMoney()