Allow different accounts on same Google account to subscribe to backups.

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

@@ -110,18 +110,6 @@ 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.")
 

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

@@ -140,8 +140,9 @@ class BackupSubscriptionCheckJob private constructor(parameters: Parameters) : C
         null
       }
 
-      if (purchaseToken?.let { hasLocalDevicePurchaseTokenMismatch(purchaseToken) } == true) {
+      val hasTokenMismatch = purchaseToken?.let { hasLocalDevicePurchaseTokenMismatch(purchaseToken) } == true
-        Log.i(TAG, "Encountered token mismatch. Attempting to redeem.")
+      if (hasActiveSignalSubscription && hasTokenMismatch) {
+        Log.i(TAG, "Encountered token mismatch with an active Signal subscription. Attempting to redeem against latest token.")
         enqueueRedemptionForNewToken(purchaseToken, product.price)
         SignalStore.backup.subscriptionStateMismatchDetected = false
         return Result.success()

billing/src/main/java/org/signal/billing/BillingApiImpl.kt

@@ -221,9 +221,18 @@ internal class BillingApiImpl(
 
   /**
    * Launches the Google Play billing flow.
-   * Returns a billing result if we launched the flow, null otherwise.
+   *
+   * If the user already has an active purchase (purchase exists and autoRenew == true) then we will not
+   * launch and instead immediately post the purchase.
    */
   override suspend fun launchBillingFlow(activity: Activity) {
+    val latestPurchase = queryPurchases()
+    if (latestPurchase is BillingPurchaseResult.Success && latestPurchase.isAutoRenewing) {
+      Log.w(TAG, "Already purchased.")
+      internalResults.emit(latestPurchase)
+      return
+    }
+
     val productDetails = queryProductsInternal().productDetailsList
     if (productDetails.isNullOrEmpty()) {
       Log.w(TAG, "No products are available! Cancelling billing flow launch.")