Emit specific exception when Google Pay is cancelled

COAND-1068
Adyen · Feb 11, 2025 · 8de903f · 8de903f
1 parent 1ddd057
commit 8de903f
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 10 deletions.
diff --git a/checkout-core/api/checkout-core.api b/checkout-core/api/checkout-core.api
@@ -151,7 +151,7 @@ public final class com/adyen/checkout/core/exception/BadModelException : com/ady
 	public fun <init> (Ljava/lang/Class;Ljava/lang/Throwable;)V
 }
 
-public final class com/adyen/checkout/core/exception/CancellationException : com/adyen/checkout/core/exception/CheckoutException {
+public class com/adyen/checkout/core/exception/CancellationException : com/adyen/checkout/core/exception/CheckoutException {
 	public fun <init> (Ljava/lang/String;)V
 }
 

diff --git a/checkout-core/src/main/java/com/adyen/checkout/core/exception/CancellationException.kt b/checkout-core/src/main/java/com/adyen/checkout/core/exception/CancellationException.kt
@@ -11,4 +11,4 @@ package com.adyen.checkout.core.exception
 /**
  * This exception indicates that the payment flow was manually cancelled by the user.
  */
-class CancellationException(errorMessage: String) : CheckoutException(errorMessage)
+open class CancellationException(errorMessage: String) : CheckoutException(errorMessage)
diff --git a/googlepay/api/googlepay.api b/googlepay/api/googlepay.api
@@ -117,6 +117,10 @@ public final class com/adyen/checkout/googlepay/GooglePayButtonType : java/lang/
 	public static fun values ()[Lcom/adyen/checkout/googlepay/GooglePayButtonType;
 }
 
+public final class com/adyen/checkout/googlepay/GooglePayCancellationException : com/adyen/checkout/core/exception/CancellationException {
+	public fun <init> (Ljava/lang/String;)V
+}
+
 public final class com/adyen/checkout/googlepay/GooglePayComponent : androidx/lifecycle/ViewModel, com/adyen/checkout/action/core/internal/ActionHandlingComponent, com/adyen/checkout/components/core/internal/ActivityResultHandlingComponent, com/adyen/checkout/components/core/internal/ButtonComponent, com/adyen/checkout/components/core/internal/PaymentComponent, com/adyen/checkout/ui/core/internal/ui/ViewableComponent {
 	public static final field Companion Lcom/adyen/checkout/googlepay/GooglePayComponent$Companion;
 	public static final field PAYMENT_METHOD_TYPES Ljava/util/List;

diff --git a/googlepay/src/main/java/com/adyen/checkout/googlepay/GooglePayCancellationException.kt b/googlepay/src/main/java/com/adyen/checkout/googlepay/GooglePayCancellationException.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2025 Adyen N.V.
+ *
+ * This file is open source and available under the MIT license. See the LICENSE file for more info.
+ *
+ * Created by oscars on 11/2/2025.
+ */
+
+package com.adyen.checkout.googlepay
+
+import com.adyen.checkout.core.exception.CancellationException
+
+/**
+ * This exception indicates that the payment flow was manually cancelled by the user.
+ */
+class GooglePayCancellationException(errorMessage: String) : CancellationException(errorMessage)
diff --git a/googlepay/src/main/java/com/adyen/checkout/googlepay/internal/ui/DefaultGooglePayDelegate.kt b/googlepay/src/main/java/com/adyen/checkout/googlepay/internal/ui/DefaultGooglePayDelegate.kt
@@ -28,6 +28,7 @@ import com.adyen.checkout.core.exception.ComponentException
 import com.adyen.checkout.core.internal.data.model.ModelUtils
 import com.adyen.checkout.core.internal.util.adyenLog
 import com.adyen.checkout.googlepay.GooglePayButtonParameters
+import com.adyen.checkout.googlepay.GooglePayCancellationException
 import com.adyen.checkout.googlepay.GooglePayComponentState
 import com.adyen.checkout.googlepay.GooglePayUnavailableException
 import com.adyen.checkout.googlepay.internal.data.model.GooglePayPaymentMethodModel
@@ -225,7 +226,7 @@ internal class DefaultGooglePayDelegate(
 
             CommonStatusCodes.CANCELED -> {
                 adyenLog(AdyenLogLevel.INFO) { "GooglePay payment canceled" }
-                exceptionChannel.trySend(ComponentException("GooglePay payment canceled"))
+                exceptionChannel.trySend(GooglePayCancellationException("GooglePay payment canceled"))
             }
 
             AutoResolveHelper.RESULT_ERROR -> {

diff --git a/...ay/src/test/java/com/adyen/checkout/googlepay/internal/ui/DefaultGooglePayDelegateTest.kt b/...ay/src/test/java/com/adyen/checkout/googlepay/internal/ui/DefaultGooglePayDelegateTest.kt
@@ -24,6 +24,7 @@ import com.adyen.checkout.components.core.internal.ui.model.CommonComponentParam
 import com.adyen.checkout.core.Environment
 import com.adyen.checkout.core.exception.CheckoutException
 import com.adyen.checkout.core.exception.ComponentException
+import com.adyen.checkout.googlepay.GooglePayCancellationException
 import com.adyen.checkout.googlepay.GooglePayComponentState
 import com.adyen.checkout.googlepay.GooglePayConfiguration
 import com.adyen.checkout.googlepay.GooglePayUnavailableException
@@ -349,6 +350,7 @@ internal class DefaultGooglePayDelegateTest(
     fun `when handling payment result, then success or error is emitted`(
         result: ApiTaskResult<PaymentData>,
         isSuccess: Boolean,
+        exceptionClass: Class<Exception>?,
     ) = runTest {
         val componentStateFlow = delegate.componentStateFlow.test(testScheduler)
         val exceptionFlow = delegate.exceptionFlow.test(testScheduler)
@@ -358,7 +360,7 @@ internal class DefaultGooglePayDelegateTest(
         if (isSuccess) {
             assertEquals(result.result, componentStateFlow.latestValue.paymentData)
         } else {
-            assertInstanceOf(ComponentException::class.java, exceptionFlow.latestValue)
+            assertInstanceOf(exceptionClass, exceptionFlow.latestValue)
         }
     }
 
@@ -424,12 +426,16 @@ internal class DefaultGooglePayDelegateTest(
 
         @JvmStatic
         fun paymentResultSource() = listOf(
-            arguments(ApiTaskResult(TEST_PAYMENT_DATA, Status.RESULT_SUCCESS), true),
-            arguments(ApiTaskResult(null, Status.RESULT_SUCCESS), false),
-            arguments(ApiTaskResult(null, Status.RESULT_CANCELED), false),
-            arguments(ApiTaskResult(null, Status.RESULT_INTERNAL_ERROR), false),
-            arguments(ApiTaskResult(null, Status.RESULT_INTERRUPTED), false),
-            arguments(ApiTaskResult(null, Status(AutoResolveHelper.RESULT_ERROR)), false),
+            arguments(ApiTaskResult(TEST_PAYMENT_DATA, Status.RESULT_SUCCESS), true, null),
+            arguments(ApiTaskResult(null, Status.RESULT_SUCCESS), false, ComponentException::class.java),
+            arguments(ApiTaskResult(null, Status.RESULT_CANCELED), false, GooglePayCancellationException::class.java),
+            arguments(ApiTaskResult(null, Status.RESULT_INTERNAL_ERROR), false, ComponentException::class.java),
+            arguments(ApiTaskResult(null, Status.RESULT_INTERRUPTED), false, ComponentException::class.java),
+            arguments(
+                ApiTaskResult(null, Status(AutoResolveHelper.RESULT_ERROR)),
+                false,
+                ComponentException::class.java,
+            ),
         )
 
         @JvmStatic