Replace cancelled result with error. (#10136)

stripe · Feb 11, 2025 · ba31bdc · ba31bdc
1 parent 8524591
commit ba31bdc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 29 deletions.
diff --git a/paymentsheet/api/paymentsheet.api b/paymentsheet/api/paymentsheet.api
@@ -773,19 +773,19 @@ public final class com/stripe/android/paymentelement/embedded/manage/ManageContr
 	public synthetic fun newArray (I)[Ljava/lang/Object;
 }
 
-public final class com/stripe/android/paymentelement/embedded/manage/ManageResult$Cancelled$Creator : android/os/Parcelable$Creator {
+public final class com/stripe/android/paymentelement/embedded/manage/ManageResult$Complete$Creator : android/os/Parcelable$Creator {
 	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/stripe/android/paymentelement/embedded/manage/ManageResult$Cancelled;
+	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/stripe/android/paymentelement/embedded/manage/ManageResult$Complete;
 	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lcom/stripe/android/paymentelement/embedded/manage/ManageResult$Cancelled;
+	public final fun newArray (I)[Lcom/stripe/android/paymentelement/embedded/manage/ManageResult$Complete;
 	public synthetic fun newArray (I)[Ljava/lang/Object;
 }
 
-public final class com/stripe/android/paymentelement/embedded/manage/ManageResult$Complete$Creator : android/os/Parcelable$Creator {
+public final class com/stripe/android/paymentelement/embedded/manage/ManageResult$Error$Creator : android/os/Parcelable$Creator {
 	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/stripe/android/paymentelement/embedded/manage/ManageResult$Complete;
+	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/stripe/android/paymentelement/embedded/manage/ManageResult$Error;
 	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lcom/stripe/android/paymentelement/embedded/manage/ManageResult$Complete;
+	public final fun newArray (I)[Lcom/stripe/android/paymentelement/embedded/manage/ManageResult$Error;
 	public synthetic fun newArray (I)[Ljava/lang/Object;
 }
 

diff --git a/...n/java/com/stripe/android/paymentelement/embedded/content/DefaultEmbeddedSheetLauncher.kt b/...n/java/com/stripe/android/paymentelement/embedded/content/DefaultEmbeddedSheetLauncher.kt
@@ -74,11 +74,7 @@ internal class DefaultEmbeddedSheetLauncher @Inject constructor(
         activityResultCaller.registerForActivityResult(ManageContract) { result ->
             sheetStateHolder.sheetIsOpen = false
             when (result) {
-                is ManageResult.Cancelled -> {
-                    if (result.customerState != null) {
-                        customerStateHolder.setCustomerState(result.customerState)
-                    }
-                }
+                is ManageResult.Error -> Unit
                 is ManageResult.Complete -> {
                     customerStateHolder.setCustomerState(result.customerState)
                     selectionHolder.set(result.selection)

diff --git a/...ntsheet/src/main/java/com/stripe/android/paymentelement/embedded/manage/ManageContract.kt b/...ntsheet/src/main/java/com/stripe/android/paymentelement/embedded/manage/ManageContract.kt
@@ -20,9 +20,7 @@ internal sealed interface ManageResult : Parcelable {
     ) : ManageResult
 
     @Parcelize
-    data class Cancelled(
-        val customerState: CustomerState?,
-    ) : ManageResult
+    object Error : ManageResult
 
     companion object {
         internal const val EXTRA_RESULT = ActivityStarter.Result.EXTRA
@@ -36,7 +34,7 @@ internal sealed interface ManageResult : Parcelable {
                 BundleCompat.getParcelable(bundle, EXTRA_RESULT, ManageResult::class.java)
             }
 
-            return result ?: Cancelled(customerState = null)
+            return result ?: Error
         }
     }
 }

diff --git a/...va/com/stripe/android/paymentelement/embedded/content/DefaultEmbeddedSheetLauncherTest.kt b/...va/com/stripe/android/paymentelement/embedded/content/DefaultEmbeddedSheetLauncherTest.kt
@@ -135,7 +135,7 @@ internal class DefaultEmbeddedSheetLauncherTest {
     fun `manageActivityLauncher callback does not update state on non-complete result`() = testScenario {
         sheetStateHolder.sheetIsOpen = true
         customerStateHolder.setCustomerState(PaymentSheetFixtures.EMPTY_CUSTOMER_STATE)
-        val result = ManageResult.Cancelled(customerState = null)
+        val result = ManageResult.Error
         val callback = manageRegisterCall.callback.asCallbackFor<ManageResult>()
 
         callback.onActivityResult(result)
@@ -145,17 +145,6 @@ internal class DefaultEmbeddedSheetLauncherTest {
         assertThat(sheetStateHolder.sheetIsOpen).isFalse()
     }
 
-    @Test
-    fun `manageActivityLauncher callback updates state on non-complete result`() = testScenario {
-        sheetStateHolder.sheetIsOpen = true
-        val result = ManageResult.Cancelled(customerState = PaymentSheetFixtures.EMPTY_CUSTOMER_STATE)
-        val callback = manageRegisterCall.callback.asCallbackFor<ManageResult>()
-        callback.onActivityResult(result)
-
-        assertThat(customerStateHolder.customer.value).isEqualTo(PaymentSheetFixtures.EMPTY_CUSTOMER_STATE)
-        assertThat(sheetStateHolder.sheetIsOpen).isFalse()
-    }
-
     @Test
     fun `onDestroy unregisters launchers`() = testScenario {
         sheetStateHolder.sheetIsOpen = true

diff --git a/...eet/src/test/java/com/stripe/android/paymentelement/embedded/manage/ManageActivityTest.kt b/...eet/src/test/java/com/stripe/android/paymentelement/embedded/manage/ManageActivityTest.kt
@@ -12,14 +12,14 @@ import org.robolectric.RobolectricTestRunner
 internal class ManageActivityTest {
 
     @Test
-    fun `when launched without args should finish with cancelled result`() {
+    fun `when launched without args should finish with error result`() {
         ActivityScenario.launchActivityForResult(
             ManageActivity::class.java,
             Bundle.EMPTY
         ).use { activityScenario ->
             assertThat(activityScenario.state).isEqualTo(Lifecycle.State.DESTROYED)
             val result = ManageContract.parseResult(0, activityScenario.result.resultData)
-            assertThat(result).isInstanceOf(ManageResult.Cancelled::class.java)
+            assertThat(result).isInstanceOf(ManageResult.Error::class.java)
         }
     }
 }