Add EmbeddedActivityLauncher #9919

tjclawson-stripe · 2025-01-15T20:16:30Z

Summary

Add EmbeddedActivityLauncher
Add FormActivity

Motivation

MOBILESDK-2940

Testing

Added tests
Modified tests
Manually verified

Changelog

github-actions · 2025-01-15T20:22:28Z

Diffuse output:

OLD: identity-example-release-base.apk (signature: V1, V2)
NEW: identity-example-release-pr.apk (signature: V1, V2)

          │          compressed          │         uncompressed         
          ├───────────┬───────────┬──────┼───────────┬───────────┬──────
 APK      │ old       │ new       │ diff │ old       │ new       │ diff 
──────────┼───────────┼───────────┼──────┼───────────┼───────────┼──────
      dex │     2 MiB │     2 MiB │  0 B │   4.1 MiB │   4.1 MiB │  0 B 
     arsc │     1 MiB │     1 MiB │  0 B │     1 MiB │     1 MiB │  0 B 
 manifest │   2.3 KiB │   2.3 KiB │  0 B │     8 KiB │     8 KiB │  0 B 
      res │ 302.6 KiB │ 302.6 KiB │  0 B │ 456.7 KiB │ 456.7 KiB │  0 B 
   native │   6.2 MiB │   6.2 MiB │  0 B │  15.8 MiB │  15.8 MiB │  0 B 
    asset │   7.2 KiB │   7.2 KiB │  0 B │   6.9 KiB │   6.9 KiB │  0 B 
    other │  90.4 KiB │  90.4 KiB │ -9 B │ 170.7 KiB │ 170.7 KiB │  0 B 
──────────┼───────────┼───────────┼──────┼───────────┼───────────┼──────
    total │   9.6 MiB │   9.6 MiB │ -9 B │  21.5 MiB │  21.5 MiB │  0 B 

 DEX     │ old   │ new   │ diff      
─────────┼───────┼───────┼───────────
   files │     1 │     1 │ 0         
 strings │ 19982 │ 19982 │ 0 (+0 -0) 
   types │  6194 │  6194 │ 0 (+0 -0) 
 classes │  4985 │  4985 │ 0 (+0 -0) 
 methods │ 29820 │ 29820 │ 0 (+0 -0) 
  fields │ 17539 │ 17539 │ 0 (+0 -0) 

 ARSC    │ old  │ new  │ diff 
─────────┼──────┼──────┼──────
 configs │  164 │  164 │  0   
 entries │ 3624 │ 3624 │  0

APK

    compressed    │   uncompressed   │                        
──────────┬───────┼───────────┬──────┤                        
 size     │ diff  │ size      │ diff │ path                   
──────────┼───────┼───────────┼──────┼────────────────────────
 28.5 KiB │ -11 B │  63.1 KiB │  0 B │ ∆ META-INF/CERT.SF     
 25.4 KiB │  +3 B │    63 KiB │  0 B │ ∆ META-INF/MANIFEST.MF 
  1.2 KiB │  -1 B │   1.2 KiB │  0 B │ ∆ META-INF/CERT.RSA    
──────────┼───────┼───────────┼──────┼────────────────────────
 55.1 KiB │  -9 B │ 127.3 KiB │  0 B │ (total)

.../src/main/java/com/stripe/android/paymentelement/embedded/DefaultEmbeddedActivityLauncher.kt

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/FormActivity.kt

jaynewstrom-stripe · 2025-01-15T20:25:04Z

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/EmbeddedContentHelper.kt

@@ -161,6 +169,10 @@ internal class DefaultEmbeddedContentHelper @AssistedInject constructor(
            transitionToManageScreen = {
            },
            transitionToFormScreen = {
+                embeddedActivityLauncher?.launchForm(


We will need some way to do this, but ideally we can just pass the method straight through, and the DefaultEmbeddedContentHelper doesn't need to know directly about FormContract.Args, or how to handle the result.

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/EmbeddedContentHelper.kt

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/FormActivity.kt

...et/src/main/java/com/stripe/android/paymentelement/embedded/SharedPaymentElementViewModel.kt

jaynewstrom-stripe

Can you write some tests?

We should have an easy test for FormActivity. And there's likely a lot of other tests we can write.

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/FormActivity.kt

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/EmbeddedContentHelper.kt

jaynewstrom-stripe · 2025-01-21T14:44:58Z

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/FormActivity.kt

+                        finish()
+                    }
+                ) {
+                    Text(args?.selectedPaymentMethodCode ?: "Whoops")


If we return above, we don't need this "whoops" text.

Wrapped in a ?.let

...et/src/main/java/com/stripe/android/paymentelement/embedded/SharedPaymentElementViewModel.kt

.../src/main/java/com/stripe/android/paymentelement/embedded/DefaultEmbeddedActivityLauncher.kt

paymentsheet/src/main/java/com/stripe/android/paymentelement/EmbeddedPaymentElement.kt

.../src/main/java/com/stripe/android/paymentelement/embedded/DefaultEmbeddedActivityLauncher.kt

jaynewstrom-stripe · 2025-01-21T19:32:18Z

.../src/main/java/com/stripe/android/paymentelement/embedded/DefaultEmbeddedActivityLauncher.kt

+        { code, metadata ->
+            formActivityLauncher.launch(FormContract.Args(code, metadata))
+        }
+        private set


This has no effect.

Removed and made override a val as well

jaynewstrom-stripe · 2025-01-21T19:32:56Z

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/EmbeddedContentHelper.kt

@@ -119,6 +125,16 @@ internal class DefaultEmbeddedContentHelper @AssistedInject constructor(
        )
    }

+    override fun setFormLauncher(


Do we have tests for this?

...et/src/main/java/com/stripe/android/paymentelement/embedded/SharedPaymentElementViewModel.kt

jaynewstrom-stripe · 2025-01-21T19:34:35Z

...tsheet/src/test/java/com/stripe/android/paymentelement/embedded/FakeEmbeddedContentHelper.kt

+    override fun setFormLauncher(
+        formLauncher: ((code: String, paymentMethodMetaData: PaymentMethodMetadata?) -> Unit)?
+    ) {
+        // NO-OP


We should have these do something, and validate it below.

Added functionality to set class property. Do we want to add logic in the validation method since it's not set/clear aren't called during initialization?

.../src/main/java/com/stripe/android/paymentelement/embedded/DefaultEmbeddedActivityLauncher.kt

jaynewstrom-stripe · 2025-01-21T21:38:08Z

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/FormActivity.kt

+                        finish()
+                    }
+                ) {
+                    args?.selectedPaymentMethodCode?.let { Text(it) }


We should know it's not null here. Can we store a local val?

It has to either have null check or be cast to FormContract.Args as the compiler cannot smart cast

jaynewstrom-stripe · 2025-01-21T21:38:57Z

...eet/src/test/java/com/stripe/android/paymentelement/embedded/EmbeddedActivityLauncherTest.kt

+
+    @Before
+    fun setUp() {
+        MockitoAnnotations.openMocks(this)


These mocks don't feel like the type of tests we should write. Is it possible to write this with fakes?

Created a task to refactor here

jaynewstrom-stripe · 2025-01-21T21:40:00Z

...eet/src/test/java/com/stripe/android/paymentelement/embedded/EmbeddedActivityLauncherTest.kt

+@RunWith(RobolectricTestRunner::class)
+internal class EmbeddedActivityLauncherTest {
+
+    private lateinit var activityResultCaller: ActivityResultCaller


We typically write these tests with a scenario (see

stripe-android/paymentsheet/src/test/java/com/stripe/android/paymentelement/embedded/DefaultEmbeddedContentHelperTest.kt

Line 133 in 83ebb13

private fun testScenario(

) rather than lateinit vars.

jaynewstrom-stripe · 2025-01-21T21:40:37Z

paymentsheet/src/test/java/com/stripe/android/paymentelement/embedded/FormActivityTest.kt

+@RunWith(RobolectricTestRunner::class)
+internal class FormActivityTest {
+
+    private lateinit var scenario: ActivityScenario<FormActivity>


Can you rewrite this without lateinit vars?

Remove lateinit vars

jaynewstrom-stripe · 2025-01-21T21:41:23Z

...rc/test/java/com/stripe/android/paymentelement/embedded/SharedPaymentElementViewModelTest.kt

+    @Test
+    fun `initEmbeddedActivityLauncher and clearEmbeddedActivityLauncher successfully init and clear formLauncher`() =
+        testScenario {
+            val launcher: ActivityResultLauncher<FormContract.Args> = mock()


Can you rewrite these with fakes instead of mocks?

Removed mocks

jaynewstrom-stripe · 2025-01-21T21:48:26Z

.../src/main/java/com/stripe/android/paymentelement/embedded/DefaultEmbeddedActivityLauncher.kt

+        lifecycleOwner.lifecycle.addObserver(
+            object : DefaultLifecycleObserver {
+                override fun onDestroy(owner: LifecycleOwner) {
+                    formActivityLauncher.unregister()


Can you write a test to ensure this is happening?

Added to EmbeddedActivityLauncherTest

Add EmbeddedActivityLauncher

fff3b37

jaynewstrom-stripe reviewed Jan 15, 2025

View reviewed changes

.../src/main/java/com/stripe/android/paymentelement/embedded/DefaultEmbeddedActivityLauncher.kt Outdated Show resolved Hide resolved

jaynewstrom-stripe reviewed Jan 15, 2025

View reviewed changes

tjclawson-stripe added 2 commits January 15, 2025 17:47

Add EmbeddedActivityLauncherFactory

69d06b3

Remove factory

513fcf6

jaynewstrom-stripe reviewed Jan 15, 2025

View reviewed changes

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/EmbeddedContentHelper.kt Outdated Show resolved Hide resolved

jaynewstrom-stripe reviewed Jan 15, 2025

View reviewed changes

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/FormActivity.kt Outdated Show resolved Hide resolved

jaynewstrom-stripe reviewed Jan 15, 2025

View reviewed changes

...et/src/main/java/com/stripe/android/paymentelement/embedded/SharedPaymentElementViewModel.kt Outdated Show resolved Hide resolved

tjclawson-stripe force-pushed the tyler/mobilesdk-2940 branch 2 times, most recently from ce8663f to 93d0c5a Compare January 16, 2025 00:27

Refactor

09981de

tjclawson-stripe force-pushed the tyler/mobilesdk-2940 branch from 93d0c5a to 09981de Compare January 16, 2025 00:28

jaynewstrom-stripe reviewed Jan 16, 2025

View reviewed changes

tjclawson-stripe requested a review from jaynewstrom-stripe January 17, 2025 00:30

tjclawson-stripe marked this pull request as ready for review January 17, 2025 00:31

tjclawson-stripe requested review from a team as code owners January 17, 2025 00:31

graphite-app bot reviewed Jan 17, 2025

View reviewed changes

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/FormActivity.kt Outdated Show resolved Hide resolved

Add tests

c8c28df

tjclawson-stripe force-pushed the tyler/mobilesdk-2940 branch from 2c98bb9 to c8c28df Compare January 17, 2025 16:29

Lint

0f53c5d

tjclawson-stripe requested a review from samer-stripe January 17, 2025 19:56