From 369085e162409a5b6de3842f02bd448ed7440439 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 23 Sep 2025 12:53:03 -0300
Subject: [PATCH] Add new log sections to backups.

---
 .../securesms/logsubmit/LogSectionRemoteBackups.kt        | 8 ++++++--
 .../src/main/java/org/signal/billing/BillingApiImpl.kt    | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt
index 2723f85f41..60ba068ac6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt
@@ -6,9 +6,11 @@
 package org.thoughtcrime.securesms.logsubmit
 
 import android.content.Context
+import com.google.android.gms.common.GoogleApiAvailability
 import kotlinx.coroutines.runBlocking
 import org.signal.donations.InAppPaymentType
 import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgress
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.GooglePlayServicesAvailability
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
 import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
 import org.thoughtcrime.securesms.database.SignalDatabase
@@ -44,11 +46,13 @@ class LogSectionRemoteBackups : LogSection {
     output.append("\n -- Subscription State\n")
 
     val backupSubscriptionId = InAppPaymentsRepository.getSubscriber(InAppPaymentSubscriberRecord.Type.BACKUP)
-    val hasGooglePlayBilling = runBlocking { AppDependencies.billingApi.getApiAvailability().isSuccess }
+    val googlePlayBillingAccess = runBlocking { AppDependencies.billingApi.getApiAvailability() }
+    val googlePlayServicesAvailability = GooglePlayServicesAvailability.fromCode(GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context))
     val inAppPayment = SignalDatabase.inAppPayments.getLatestInAppPaymentByType(InAppPaymentType.RECURRING_BACKUP)
 
     output.append("Has backup subscription id: ${backupSubscriptionId != null}\n")
-    output.append("Has Google Play Billing:    $hasGooglePlayBilling\n\n")
+    output.append("Google Play Billing state:  $googlePlayBillingAccess\n")
+    output.append("Google Play Services state: $googlePlayServicesAvailability\n\n")
 
     if (inAppPayment != null) {
       output.append("IAP end of period (seconds):       ${inAppPayment.endOfPeriodSeconds}\n")
diff --git a/billing/src/main/java/org/signal/billing/BillingApiImpl.kt b/billing/src/main/java/org/signal/billing/BillingApiImpl.kt
index dc4abbebc8..7cdff5dc8a 100644
--- a/billing/src/main/java/org/signal/billing/BillingApiImpl.kt
+++ b/billing/src/main/java/org/signal/billing/BillingApiImpl.kt
@@ -134,7 +134,7 @@ internal class BillingApiImpl(
       }
 
       BillingResponseCode.ITEM_NOT_OWNED -> {
-        error("This shouldn't happen during the purchase process", true)
+        error("This shouldn't happen during the purchase process")
       }
 
       BillingResponseCode.ITEM_UNAVAILABLE -> {
@@ -204,7 +204,7 @@ internal class BillingApiImpl(
       .setProductType(ProductType.SUBS)
       .build()
 
-    val result = doOnConnectionReady("queryPurchases", true) {
+    val result = doOnConnectionReady("queryPurchases") {
       billingClient.queryPurchasesAsync(param)
     }