Fix hot loop when creating a subscription to remote backups.

signalapp · Dec 9, 2024 · 0c86ff1 · 0c86ff1
1 parent 5e10ccc
commit 0c86ff1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.../java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt b/.../java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt
@@ -95,6 +95,18 @@ class MessageBackupsFlowViewModel(
             Log.d(TAG, "Got successful purchase result for purchase at ${result.purchaseTime}")
             val id = internalStateFlow.value.inAppPayment!!.id
 
+            if (result.isAcknowledged) {
+              Log.w(TAG, "Payment is already acknowledged. Ignoring.")
+
+              internalStateFlow.update {
+                it.copy(
+                  stage = MessageBackupsStage.COMPLETED
+                )
+              }
+
+              return@collect
+            }
+
             try {
               Log.d(TAG, "Attempting to handle successful purchase.")
 

diff --git a/billing/src/main/java/org/signal/billing/BillingApiImpl.kt b/billing/src/main/java/org/signal/billing/BillingApiImpl.kt
@@ -202,8 +202,6 @@ internal class BillingApiImpl(
       billingClient.queryPurchasesAsync(param)
     }
 
-    purchasesUpdatedListener.onPurchasesUpdated(result.billingResult, result.purchasesList)
-
     val purchase = result.purchasesList.maxByOrNull { it.purchaseTime } ?: return BillingPurchaseResult.None
 
     return BillingPurchaseResult.Success(