@stripe/stripe-react-native 0.42.0 → 0.44.0

package/android/src/main/java/com/reactnativestripesdk/pushprovisioning/AddToWalletButtonManager.kt

@@ -3,15 +3,18 @@ package com.reactnativestripesdk.pushprovisioning
 import android.content.Context
 import com.bumptech.glide.Glide
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.common.MapBuilder
+import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 
-
-class AddToWalletButtonManager(applicationContext: Context) : SimpleViewManager<AddToWalletButtonView>() {
+@ReactModule(name = AddToWalletButtonManager.REACT_CLASS)
+class AddToWalletButtonManager(
+  applicationContext: Context,
+) : SimpleViewManager<AddToWalletButtonView>() {
   private val requestManager = Glide.with(applicationContext)
-  override fun getName() = "AddToWalletButton"
+
+  override fun getName() = REACT_CLASS
 
   override fun onDropViewInstance(view: AddToWalletButtonView) {
     view.onDropViewInstance()
@@ -23,33 +26,48 @@ class AddToWalletButtonManager(applicationContext: Context) : SimpleViewManager<
     view.onAfterUpdateTransaction()
   }
 
-  override fun createViewInstance(reactContext: ThemedReactContext): AddToWalletButtonView {
-    return AddToWalletButtonView(reactContext, requestManager)
-  }
+  override fun createViewInstance(reactContext: ThemedReactContext): AddToWalletButtonView =
+    AddToWalletButtonView(reactContext, requestManager)
 
-  override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
-    return MapBuilder.of(
-      AddToWalletCompleteEvent.EVENT_NAME, MapBuilder.of("registrationName", "onCompleteAction")
+  override fun getExportedCustomDirectEventTypeConstants() =
+    mutableMapOf(
+      AddToWalletCompleteEvent.EVENT_NAME to
+        mutableMapOf("registrationName" to "onCompleteAction"),
     )
-  }
 
   @ReactProp(name = "androidAssetSource")
-  fun source(view: AddToWalletButtonView, source: ReadableMap) {
+  fun source(
+    view: AddToWalletButtonView,
+    source: ReadableMap,
+  ) {
     view.setSourceMap(source)
   }
 
   @ReactProp(name = "cardDetails")
-  fun cardDetails(view: AddToWalletButtonView, cardDetails: ReadableMap) {
+  fun cardDetails(
+    view: AddToWalletButtonView,
+    cardDetails: ReadableMap,
+  ) {
     view.setCardDetails(cardDetails)
   }
 
   @ReactProp(name = "ephemeralKey")
-  fun ephemeralKey(view: AddToWalletButtonView, ephemeralKey: ReadableMap) {
+  fun ephemeralKey(
+    view: AddToWalletButtonView,
+    ephemeralKey: ReadableMap,
+  ) {
     view.setEphemeralKey(ephemeralKey)
   }
 
   @ReactProp(name = "token")
-  fun token(view: AddToWalletButtonView, token: ReadableMap?) {
+  fun token(
+    view: AddToWalletButtonView,
+    token: ReadableMap?,
+  ) {
     view.setToken(token)
   }
+
+  companion object {
+    const val REACT_CLASS = "AddToWalletButton"
+  }
 }

package/android/src/main/java/com/reactnativestripesdk/pushprovisioning/AddToWalletButtonView.kt

@@ -1,5 +1,6 @@
 package com.reactnativestripesdk.pushprovisioning
 
+import android.annotation.SuppressLint
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.drawable.Drawable
@@ -16,18 +17,19 @@ import com.bumptech.glide.request.target.Target
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.UIManagerModule
-import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.uimanager.UIManagerHelper
 import com.reactnativestripesdk.utils.createError
 
-
-class AddToWalletButtonView(private val context: ThemedReactContext, private val requestManager: RequestManager) : AppCompatImageView(context) {
+@SuppressLint("ViewConstructor")
+class AddToWalletButtonView(
+  private val context: ThemedReactContext,
+  private val requestManager: RequestManager,
+) : AppCompatImageView(context) {
   private var cardDetails: ReadableMap? = null
   private var ephemeralKey: String? = null
   private var sourceMap: ReadableMap? = null
   private var token: ReadableMap? = null
 
-  private var eventDispatcher: EventDispatcher? = context.getNativeModule(UIManagerModule::class.java)?.eventDispatcher
   private var loadedSource: Any? = null
   private var heightOverride: Int = 0
   private var widthOverride: Int = 0
@@ -42,17 +44,26 @@ class AddToWalletButtonView(private val context: ThemedReactContext, private val
           this,
           cardDescription,
           ephemeralKey,
-          token)
-      } ?: run {
-        dispatchEvent(
-          createError("Failed", "Missing parameters. `ephemeralKey` must be supplied in the props to <AddToWalletButton />")
+          token,
         )
       }
-    } ?: run {
-      dispatchEvent(
-        createError("Failed", "Missing parameters. `cardDetails.cardDescription` must be supplied in the props to <AddToWalletButton />")
-      )
+        ?: run {
+          dispatchEvent(
+            createError(
+              "Failed",
+              "Missing parameters. `ephemeralKey` must be supplied in the props to <AddToWalletButton />",
+            ),
+          )
+        }
     }
+      ?: run {
+        dispatchEvent(
+          createError(
+            "Failed",
+            "Missing parameters. `cardDetails.cardDescription` must be supplied in the props to <AddToWalletButton />",
+          ),
+        )
+      }
     return true
   }
 
@@ -78,23 +89,38 @@ class AddToWalletButtonView(private val context: ThemedReactContext, private val
 
       requestManager
         .load(sourceToLoad)
-        .addListener(object : RequestListener<Drawable> {
-          override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>?, isFirstResource: Boolean): Boolean {
-            dispatchEvent(
-              createError("Failed", "Failed to load the source from $sourceToLoad")
-            )
-            return true
-          }
-          override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
-            setImageDrawable(
-              RippleDrawable(
-                ColorStateList.valueOf(Color.parseColor("#e0e0e0")),
-                resource,
-                null))
-            return true
-          }
-        })
-        .centerCrop()
+        .addListener(
+          object : RequestListener<Drawable> {
+            override fun onLoadFailed(
+              e: GlideException?,
+              model: Any?,
+              target: Target<Drawable>?,
+              isFirstResource: Boolean,
+            ): Boolean {
+              dispatchEvent(
+                createError("Failed", "Failed to load the source from $sourceToLoad"),
+              )
+              return true
+            }
+
+            override fun onResourceReady(
+              resource: Drawable?,
+              model: Any?,
+              target: Target<Drawable>?,
+              dataSource: DataSource?,
+              isFirstResource: Boolean,
+            ): Boolean {
+              setImageDrawable(
+                RippleDrawable(
+                  ColorStateList.valueOf(Color.parseColor("#e0e0e0")),
+                  resource,
+                  null,
+                ),
+              )
+              return true
+            }
+          },
+        ).centerCrop()
         .override((widthOverride * scale).toInt(), (heightOverride * scale).toInt())
         .into(this)
     }
@@ -113,7 +139,12 @@ class AddToWalletButtonView(private val context: ThemedReactContext, private val
     return null
   }
 
-  override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+  override fun onSizeChanged(
+    w: Int,
+    h: Int,
+    oldw: Int,
+    oldh: Int,
+  ) {
     super.onSizeChanged(w, h, oldw, oldh)
     if (w > 0 && h > 0) {
       heightOverride = h
@@ -145,11 +176,6 @@ class AddToWalletButtonView(private val context: ThemedReactContext, private val
   }
 
   fun dispatchEvent(error: WritableMap?) {
-    eventDispatcher?.dispatchEvent(
-      AddToWalletCompleteEvent(
-        id,
-        error
-      )
-    )
+    UIManagerHelper.getEventDispatcherForReactTag(context, id)?.dispatchEvent(AddToWalletCompleteEvent(context.surfaceId, id, error))
   }
 }

package/android/src/main/java/com/reactnativestripesdk/pushprovisioning/AddToWalletCompleteEvent.kt

@@ -1,22 +1,18 @@
 package com.reactnativestripesdk.pushprovisioning
+
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-internal class AddToWalletCompleteEvent constructor(viewTag: Int, private val error: WritableMap?) : Event<AddToWalletCompleteEvent>(viewTag) {
-  override fun getEventName(): String {
-    return EVENT_NAME
-  }
+internal class AddToWalletCompleteEvent(
+  surfaceId: Int,
+  viewTag: Int,
+  private val error: WritableMap?,
+) : Event<AddToWalletCompleteEvent>(surfaceId, viewTag) {
+  override fun getEventName(): String = EVENT_NAME
 
-  override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-    rctEventEmitter.receiveEvent(viewTag, eventName, serializeEventData())
-  }
-
-  private fun serializeEventData(): WritableMap? {
-    return error
-  }
+  override fun getEventData() = error
 
   companion object {
-    const val EVENT_NAME = "onCompleteAction"
+    const val EVENT_NAME = "topCompleteAction"
   }
 }

package/android/src/main/java/com/reactnativestripesdk/pushprovisioning/EphemeralKeyProvider.kt

@@ -4,32 +4,30 @@ import android.os.Parcel
 import android.os.Parcelable
 import com.stripe.android.pushProvisioning.PushProvisioningEphemeralKeyProvider
 
+class EphemeralKeyProvider(
+  private val ephemeralKey: String,
+) : PushProvisioningEphemeralKeyProvider {
+  private constructor(parcel: Parcel) : this(ephemeralKey = parcel.readString() ?: "")
 
-class EphemeralKeyProvider(private val ephemeralKey: String) : PushProvisioningEphemeralKeyProvider {
+  override fun describeContents(): Int = hashCode()
 
-  private constructor(parcel: Parcel) : this(
-    ephemeralKey = parcel.readString() ?: ""
-  )
-
-  override fun describeContents(): Int {
-    return hashCode()
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) {
+  override fun writeToParcel(
+    dest: Parcel,
+    flags: Int,
+  ) {
     dest.writeString(ephemeralKey)
   }
 
-  override fun createEphemeralKey(apiVersion: String, keyUpdateListener: com.stripe.android.pushProvisioning.EphemeralKeyUpdateListener) {
+  override fun createEphemeralKey(
+    apiVersion: String,
+    keyUpdateListener: com.stripe.android.pushProvisioning.EphemeralKeyUpdateListener,
+  ) {
     keyUpdateListener.onKeyUpdate(ephemeralKey)
   }
 
   companion object CREATOR : Parcelable.Creator<EphemeralKeyProvider> {
-    override fun createFromParcel(parcel: Parcel): EphemeralKeyProvider {
-      return EphemeralKeyProvider(parcel)
-    }
+    override fun createFromParcel(parcel: Parcel): EphemeralKeyProvider = EphemeralKeyProvider(parcel)
 
-    override fun newArray(size: Int): Array<EphemeralKeyProvider?> {
-      return arrayOfNulls(size)
-    }
+    override fun newArray(size: Int): Array<EphemeralKeyProvider?> = arrayOfNulls(size)
   }
 }

package/android/src/main/java/com/reactnativestripesdk/pushprovisioning/PushProvisioningProxy.kt

@@ -14,37 +14,34 @@ import com.reactnativestripesdk.utils.mapError
 import com.stripe.android.pushProvisioning.PushProvisioningActivity
 import com.stripe.android.pushProvisioning.PushProvisioningActivityStarter
 
-
 object PushProvisioningProxy {
   private const val TAG = "StripePushProvisioning"
   private var description = "Added by Stripe"
   private var tokenRequiringTokenization: ReadableMap? = null
 
-  fun getApiVersion(): String {
-    return try {
+  fun getApiVersion(): String =
+    try {
       Class.forName("com.stripe.android.pushProvisioning.PushProvisioningActivity")
       PushProvisioningActivity.API_VERSION
     } catch (e: Exception) {
       Log.e(TAG, "PushProvisioning dependency not found")
       ""
     }
-  }
 
-  fun isNFCEnabled(context: ReactApplicationContext): Boolean {
-    return if (context.packageManager.hasSystemFeature(PackageManager.FEATURE_NFC)) {
+  fun isNFCEnabled(context: ReactApplicationContext): Boolean =
+    if (context.packageManager.hasSystemFeature(PackageManager.FEATURE_NFC)) {
       val adapter = NfcAdapter.getDefaultAdapter(context)
       adapter?.isEnabled ?: false
     } else {
       false
     }
-  }
 
   fun invoke(
-          context: ReactApplicationContext,
-          view: AddToWalletButtonView,
-          cardDescription: String,
-          ephemeralKey: String,
-          token: ReadableMap?
+    context: ReactApplicationContext,
+    view: AddToWalletButtonView,
+    cardDescription: String,
+    ephemeralKey: String,
+    token: ReadableMap?,
   ) {
     try {
       Class.forName("com.stripe.android.pushProvisioning.PushProvisioningActivityStarter")
@@ -52,65 +49,84 @@ object PushProvisioningProxy {
       tokenRequiringTokenization = token
       createActivityEventListener(context, view)
       context.currentActivity?.let {
-        DefaultPushProvisioningProxy().beginPushProvisioning(
-          it,
-          description,
-          EphemeralKeyProvider(ephemeralKey)
-        )
-      } ?: run {
-        view.dispatchEvent(
-          createError(
-            "Failed",
-            "Activity doesn't exist yet. You can safely retry.")
-        )
+        DefaultPushProvisioningProxy()
+          .beginPushProvisioning(it, description, EphemeralKeyProvider(ephemeralKey))
       }
+        ?: run {
+          view.dispatchEvent(
+            createError("Failed", "Activity doesn't exist yet. You can safely retry."),
+          )
+        }
     } catch (e: Exception) {
       Log.e(TAG, "There was a problem using Stripe Android PushProvisioning: " + e.message)
     }
   }
 
-  fun isCardInWallet(activity: Activity, cardLastFour: String, callback: TokenCheckHandler) {
+  fun isCardInWallet(
+    activity: Activity,
+    cardLastFour: String,
+    callback: TokenCheckHandler,
+  ) {
     TapAndPayProxy.findExistingToken(activity, cardLastFour, callback)
   }
 
-  private fun createActivityEventListener(context: ReactApplicationContext, view: AddToWalletButtonView) {
-    val listener = object : BaseActivityEventListener() {
-      override fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(activity, requestCode, resultCode, data)
-        if (requestCode == TapAndPayProxy.REQUEST_CODE_TOKENIZE) {
-          view.dispatchEvent(
-            if (resultCode == RESULT_OK) null else mapError("Failed", "Failed to verify identity.", null, null, null, null)
-          )
-        } else if (requestCode == PushProvisioningActivityStarter.REQUEST_CODE) {
-          if (resultCode == PushProvisioningActivity.RESULT_OK) {
-            tokenRequiringTokenization?.let { tokenRequiringTokenization ->
-              val tokenReferenceId = tokenRequiringTokenization.getString("id")
-              if (tokenReferenceId.isNullOrBlank()) {
-                view.dispatchEvent(
-                  mapError("Failed", "Token object passed to `<AddToWalletButton />` is missing the `id` field.", null, null, null, null)
-                )
+  private fun createActivityEventListener(
+    context: ReactApplicationContext,
+    view: AddToWalletButtonView,
+  ) {
+    val listener =
+      object : BaseActivityEventListener() {
+        override fun onActivityResult(
+          activity: Activity,
+          requestCode: Int,
+          resultCode: Int,
+          data: Intent?,
+        ) {
+          super.onActivityResult(activity, requestCode, resultCode, data)
+          if (requestCode == TapAndPayProxy.REQUEST_CODE_TOKENIZE) {
+            view.dispatchEvent(
+              if (resultCode == RESULT_OK) {
+                null
               } else {
-                TapAndPayProxy.tokenize(
-                  activity,
-                  tokenReferenceId,
-                  tokenRequiringTokenization,
-                  description
+                mapError("Failed", "Failed to verify identity.", null, null, null, null)
+              },
+            )
+          } else if (requestCode == PushProvisioningActivityStarter.REQUEST_CODE) {
+            if (resultCode == PushProvisioningActivity.RESULT_OK) {
+              tokenRequiringTokenization?.let { tokenRequiringTokenization ->
+                val tokenReferenceId = tokenRequiringTokenization.getString("id")
+                if (tokenReferenceId.isNullOrBlank()) {
+                  view.dispatchEvent(
+                    mapError(
+                      "Failed",
+                      "Token object passed to `<AddToWalletButton />` is missing the `id` field.",
+                      null,
+                      null,
+                      null,
+                      null,
+                    ),
+                  )
+                } else {
+                  TapAndPayProxy.tokenize(
+                    activity,
+                    tokenReferenceId,
+                    tokenRequiringTokenization,
+                    description,
+                  )
+                }
+              } ?: run { view.dispatchEvent(null) }
+            } else if (resultCode == PushProvisioningActivity.RESULT_ERROR) {
+              data?.let {
+                val error: PushProvisioningActivityStarter.Error =
+                  PushProvisioningActivityStarter.Error.fromIntent(data)
+                view.dispatchEvent(
+                  mapError(error.code.toString(), error.message, null, null, null, null),
                 )
               }
-            } ?: run {
-              view.dispatchEvent(null)
-            }
-          } else if (resultCode == PushProvisioningActivity.RESULT_ERROR) {
-            data?.let {
-              val error: PushProvisioningActivityStarter.Error = PushProvisioningActivityStarter.Error.fromIntent(data)
-              view.dispatchEvent(
-                mapError(error.code.toString(), error.message, null, null, null, null)
-              )
             }
           }
         }
       }
-    }
     context.addActivityEventListener(listener)
   }
 }
@@ -119,11 +135,11 @@ class DefaultPushProvisioningProxy {
   fun beginPushProvisioning(
     activity: Activity,
     description: String,
-    provider: EphemeralKeyProvider
+    provider: EphemeralKeyProvider,
   ) {
-      PushProvisioningActivityStarter(
-        activity,
-        PushProvisioningActivityStarter.Args(description, provider, false)
-      ).startForResult()
+    PushProvisioningActivityStarter(
+      activity,
+      PushProvisioningActivityStarter.Args(description, provider, false),
+    ).startForResult()
   }
 }