Merge branch 'fix_unableToStartWebCheckoutSubsequently' of https://gi…

…thub.com/paypal/paypal-android into fix_unableToStartWebCheckoutSubsequently
paypal · Apr 23, 2024 · cb5d5b7 · cb5d5b7
2 parents d8cbcc2 + 01eb6b5
commit cb5d5b7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,10 +13,13 @@
   * Add `returnUrl` property to `CardVaultRequest`
   * Add `authChallenge` property to `CardVaultResult`
   * Add `CardAuthChallenge` type
+  * Add `removeObservers` to `CardClient`
 * FraudDetection
   * Bump Magnes dependency to version 5.4.0
 * PaymentButtons
   * Update font typeface to "PayPalOpen" to meet brand guidelines
+* PayPalWebPayments
+  * Add `removeObservers` to `PayPalWebCheckoutClient`
 
 ## 1.3.0 (2024-01-09)
 * PaymentButtons

diff --git a/CardPayments/src/main/java/com/paypal/android/cardpayments/CardClient.kt b/CardPayments/src/main/java/com/paypal/android/cardpayments/CardClient.kt
@@ -201,6 +201,9 @@ class CardClient internal constructor(
         cardVaultListener?.onVaultFailure(PayPalSDKError(1, "User Canceled"))
     }
 
+    /**
+     * Call this method at the end of the card flow
+     */
     fun removeObservers() {
         activityReference.get()?.let { it.lifecycle.removeObserver(lifeCycleObserver) }
         approveOrderListener = null

diff --git a/Demo/src/main/java/com/paypal/android/ui/paypalwebvault/PayPalWebVaultViewModel.kt b/Demo/src/main/java/com/paypal/android/ui/paypalwebvault/PayPalWebVaultViewModel.kt
@@ -126,4 +126,9 @@ class PayPalWebVaultViewModel @Inject constructor(
     override fun onPayPalWebVaultCanceled() {
         vaultPayPalState = ActionState.Failure(Exception("USER CANCELED"))
     }
+
+    override fun onCleared() {
+        super.onCleared()
+        paypalClient.removeObservers()
+    }
 }
diff --git a/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardViewModel.kt b/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardViewModel.kt
@@ -204,4 +204,9 @@ class VaultCardViewModel @Inject constructor(
         }
         cardClient.presentAuthChallenge(activity, authChallenge)
     }
+
+    override fun onCleared() {
+        super.onCleared()
+        cardClient.removeObservers()
+    }
 }
diff --git a/...WebPayments/src/main/java/com/paypal/android/paypalwebpayments/PayPalWebCheckoutClient.kt b/...WebPayments/src/main/java/com/paypal/android/paypalwebpayments/PayPalWebCheckoutClient.kt
@@ -134,6 +134,9 @@ class PayPalWebCheckoutClient internal constructor(
         vaultListener?.onPayPalWebVaultCanceled()
     }
 
+    /**
+     * Call this method at the end of the web checkout flow
+     */
     fun removeObservers() {
         activityReference.get()?.let { it.lifecycle.removeObserver(observer) }
         vaultListener = null