From 34f3ae38cc6cf0578de370106418f4f1eecfb41b Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 11 Feb 2022 10:05:53 -0400
Subject: [PATCH] Remove IsGooglePayAvailable error and check.

---
 .../app/subscription/DonationPaymentRepository.kt      |  2 --
 .../settings/app/subscription/boost/BoostViewModel.kt  | 10 ----------
 .../settings/app/subscription/errors/DonationError.kt  |  5 -----
 .../app/subscription/subscribe/SubscribeViewModel.kt   | 10 ----------
 4 files changed, 27 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
index 3fe511ff79..ee85c67037 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
@@ -58,8 +58,6 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
   private val googlePayApi = GooglePayApi(activity, StripeApi.Gateway(Environment.Donations.STRIPE_CONFIGURATION), Environment.Donations.GOOGLE_PAY_CONFIGURATION)
   private val stripeApi = StripeApi(Environment.Donations.STRIPE_CONFIGURATION, this, this, ApplicationDependencies.getOkHttpClient())
 
-  fun isGooglePayAvailable(): Completable = googlePayApi.queryIsReadyToPay()
-
   fun scheduleSyncForAccountRecordChange() {
     SignalExecutors.BOUNDED.execute {
       scheduleSyncForAccountRecordChangeSync()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostViewModel.kt
index 7a55912ca8..8c68231174 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostViewModel.kt
@@ -110,16 +110,6 @@ class BoostViewModel(
       }
     )
 
-    disposables += donationPaymentRepository.isGooglePayAvailable().subscribeBy(
-      onComplete = { store.update { it.copy(isGooglePayAvailable = true) } },
-      onError = {
-        DonationError.routeDonationError(
-          ApplicationDependencies.getApplication(),
-          DonationError.getGooglePayNotAvailableError(DonationErrorSource.BOOST, it)
-        )
-      }
-    )
-
     disposables += currencyObservable.subscribeBy { currency ->
       store.update {
         it.copy(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationError.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationError.kt
index 8d6b31a568..21a47b57b8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationError.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationError.kt
@@ -107,11 +107,6 @@ sealed class DonationError(val source: DonationErrorSource, cause: Throwable) :
       }
     }
 
-    @JvmStatic
-    fun getGooglePayNotAvailableError(source: DonationErrorSource, throwable: Throwable): DonationError {
-      return GooglePayError.NotAvailableError(source, throwable)
-    }
-
     @JvmStatic
     fun getGooglePayRequestTokenError(source: DonationErrorSource, throwable: Throwable): DonationError {
       return GooglePayError.RequestTokenError(source, throwable)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeViewModel.kt
index fec7c3391c..37e8042559 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeViewModel.kt
@@ -131,16 +131,6 @@ class SubscribeViewModel(
       onError = this::handleSubscriptionDataLoadFailure
     )
 
-    disposables += donationPaymentRepository.isGooglePayAvailable().subscribeBy(
-      onComplete = { store.update { it.copy(isGooglePayAvailable = true) } },
-      onError = {
-        DonationError.routeDonationError(
-          ApplicationDependencies.getApplication(),
-          DonationError.getGooglePayNotAvailableError(DonationErrorSource.BOOST, it)
-        )
-      }
-    )
-
     disposables += currency.subscribe { selection ->
       store.update { it.copy(currencySelection = selection) }
     }