@stripe/stripe-react-native 0.57.0 → 0.57.1

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

@@ -2,37 +2,45 @@ package com.reactnativestripesdk.pushprovisioning
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
-import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.RippleDrawable
 import android.view.MotionEvent
 import android.webkit.URLUtil
 import androidx.appcompat.widget.AppCompatImageView
-import com.bumptech.glide.RequestManager
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.load.model.GlideUrl
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
+import androidx.core.graphics.drawable.toDrawable
+import androidx.core.graphics.toColorInt
+import androidx.core.net.toUri
+import com.facebook.common.executors.UiThreadImmediateExecutorService
+import com.facebook.common.references.CloseableReference
+import com.facebook.datasource.BaseDataSubscriber
+import com.facebook.datasource.DataSource
+import com.facebook.drawee.backends.pipeline.Fresco
+import com.facebook.imagepipeline.image.CloseableBitmap
+import com.facebook.imagepipeline.image.CloseableImage
+import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper
 import com.reactnativestripesdk.utils.createError
 
 @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 loadedSource: Any? = null
-  private var heightOverride: Int = 0
-  private var widthOverride: Int = 0
+  private var loadedSource: String? = null
+  private var currentDataSource: DataSource<CloseableReference<CloseableImage>>? = null
+
+  init {
+    scaleType = ScaleType.CENTER_CROP
+    clipToOutline = true
+  }
 
   override fun performClick(): Boolean {
     super.performClick()
@@ -78,85 +86,90 @@ class AddToWalletButtonView(
   }
 
   fun onAfterUpdateTransaction() {
-    val sourceToLoad = getUrlOrResourceId(sourceMap)
-    if (sourceToLoad == null) {
-      requestManager.clear(this)
+    val uri = sourceMap?.getString("uri")
+    if (uri == null) {
+      cancelCurrentRequest()
       setImageDrawable(null)
       loadedSource = null
-    } else if (sourceToLoad != loadedSource || (heightOverride > 0 || widthOverride > 0)) {
-      loadedSource = sourceToLoad
-      val scale = sourceMap?.getDouble("scale") ?: 1.0
-
-      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()
-        .override((widthOverride * scale).toInt(), (heightOverride * scale).toInt())
-        .into(this)
+      return
     }
-  }
 
-  private fun getUrlOrResourceId(sourceMap: ReadableMap?): Any? {
-    sourceMap?.getString("uri")?.let {
-      return if (URLUtil.isValidUrl(it)) {
-        // Debug mode, Image.resolveAssetSource resolves to local http:// URL
-        GlideUrl(it)
+    if (uri != loadedSource) {
+      loadedSource = uri
+      if (URLUtil.isValidUrl(uri)) {
+        // Debug mode: Image.resolveAssetSource resolves to local http:// URL
+        loadImageFromUrl(uri)
       } else {
-        // Release mode, Image.resolveAssetSource resolves to a drawable resource
-        context.resources.getIdentifier(it, "drawable", context.packageName)
+        // Release mode: Image.resolveAssetSource resolves to a drawable resource name
+        loadImageFromDrawable(uri)
       }
     }
-    return null
   }
 
-  override fun onSizeChanged(
-    w: Int,
-    h: Int,
-    oldw: Int,
-    oldh: Int,
-  ) {
-    super.onSizeChanged(w, h, oldw, oldh)
-    if (w > 0 && h > 0) {
-      heightOverride = h
-      widthOverride = w
-      onAfterUpdateTransaction()
-      heightOverride = 0
-      widthOverride = 0
+  private fun loadImageFromUrl(url: String) {
+    cancelCurrentRequest()
+
+    val imageRequest =
+      ImageRequestBuilder
+        .newBuilderWithSource(url.toUri())
+        .build()
+
+    val dataSource = Fresco.getImagePipeline().fetchDecodedImage(imageRequest, context)
+    currentDataSource = dataSource
+
+    dataSource.subscribe(
+      object : BaseDataSubscriber<CloseableReference<CloseableImage>>() {
+        override fun onNewResultImpl(dataSource: DataSource<CloseableReference<CloseableImage>>) {
+          if (!dataSource.isFinished) return
+          val imageRef = dataSource.result ?: return
+
+          try {
+            val image = imageRef.get()
+            if (image is CloseableBitmap) {
+              val drawable = image.underlyingBitmap.toDrawable(resources)
+              setImageWithRipple(drawable)
+            }
+          } finally {
+            CloseableReference.closeSafely(imageRef)
+          }
+        }
+
+        override fun onFailureImpl(dataSource: DataSource<CloseableReference<CloseableImage>>) {
+          dispatchEvent(createError("Failed", "Failed to load the source from $url"))
+        }
+      },
+      UiThreadImmediateExecutorService.getInstance(),
+    )
+  }
+
+  private fun loadImageFromDrawable(resourceName: String) {
+    // Instance is deprecated, but have to use until we drop support for RN 0.79
+    @Suppress("DEPRECATION")
+    val drawable = ResourceDrawableIdHelper.instance.getResourceDrawable(context, resourceName)
+    if (drawable != null) {
+      setImageWithRipple(drawable)
+    } else {
+      dispatchEvent(createError("Failed", "Failed to load drawable resource: $resourceName"))
     }
   }
 
+  private fun setImageWithRipple(drawable: Drawable) {
+    setImageDrawable(
+      RippleDrawable(
+        ColorStateList.valueOf("#e0e0e0".toColorInt()),
+        drawable,
+        null,
+      ),
+    )
+  }
+
+  private fun cancelCurrentRequest() {
+    currentDataSource?.close()
+    currentDataSource = null
+  }
+
   fun onDropViewInstance() {
-    requestManager.clear(this)
+    cancelCurrentRequest()
   }
 
   fun setSourceMap(map: ReadableMap?) {

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

@@ -2,11 +2,12 @@ package com.reactnativestripesdk.pushprovisioning
 
 import android.app.Activity
 import android.util.Log
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.google.android.gms.tasks.Task
 import com.reactnativestripesdk.utils.createError
+import com.reactnativestripesdk.utils.getIntOr
 
 typealias TokenCheckHandler =
   (isCardInWallet: Boolean, token: WritableMap?, error: WritableMap?) -> Unit
@@ -25,6 +26,7 @@ object TapAndPayProxy {
       val tapAndPayClientClass = Class.forName("com.google.android.gms.tapandpay.TapAndPayClient")
       val listTokensMethod = tapAndPayClientClass.getMethod("listTokens")
 
+      @Suppress("UNCHECKED_CAST")
       listTokensMethod.invoke(client) as Task<List<Any>>
     } catch (e: Exception) {
       Log.e(TAG, "There was a problem listing tokens with Google TapAndPay: " + e.message)
@@ -97,9 +99,9 @@ object TapAndPayProxy {
         tapAndPayClient,
         activity,
         tokenReferenceId,
-        token.getInt("serviceProvider"),
+        token.getIntOr("serviceProvider", 0),
         cardDescription,
-        token.getInt("network"),
+        token.getIntOr("network", 0),
         REQUEST_CODE_TOKENIZE,
       )
     } catch (e: Exception) {
@@ -108,7 +110,7 @@ object TapAndPayProxy {
   }
 
   private fun mapFromTokenInfo(token: Any?): WritableMap {
-    val result = WritableNativeMap()
+    val result = Arguments.createMap()
     token?.let {
       try {
         val tokenInfoClass = Class.forName("com.google.android.gms.tapandpay.issuer.TokenInfo")

package/android/src/main/java/com/reactnativestripesdk/utils/Errors.kt

@@ -1,7 +1,7 @@
 package com.reactnativestripesdk.utils
 
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.stripe.android.core.exception.APIException
 import com.stripe.android.core.exception.AuthenticationException
 import com.stripe.android.core.exception.InvalidRequestException
@@ -66,8 +66,8 @@ internal fun mapError(
   type: String?,
   stripeErrorCode: String?,
 ): WritableMap {
-  val map: WritableMap = WritableNativeMap()
-  val details: WritableMap = WritableNativeMap()
+  val map: WritableMap = Arguments.createMap()
+  val details: WritableMap = Arguments.createMap()
   details.putString("code", code)
   details.putString("message", message)
   details.putString("localizedMessage", localizedMessage)
@@ -178,8 +178,18 @@ internal fun createError(
   return mapError(code, error.message, error.localizedMessage, null, null, null)
 }
 
+internal fun createCanceledError(message: String? = null): WritableMap = createError(ErrorType.Canceled.toString(), message)
+
+internal fun createFailedError(error: Throwable): WritableMap = createError(ErrorType.Failed.toString(), error)
+
 internal fun createMissingInitError(): WritableMap =
   createError(
     ErrorType.Failed.toString(),
     "Stripe has not been initialized. Initialize Stripe in your app with the StripeProvider component or the initStripe method.",
   )
+
+internal fun createOnrampNotConfiguredError(): WritableMap =
+  createError(
+    ErrorType.Failed.toString(),
+    "Onramp is not configured.",
+  )

package/android/src/main/java/com/reactnativestripesdk/utils/Extensions.kt

@@ -45,6 +45,14 @@ fun ReadableMap?.getDoubleOr(
   default: Double,
 ): Double = getDoubleOrNull(key) ?: default
 
+fun ReadableMap?.getLongOrNull(key: String): Long? =
+  if (this?.hasKey(key) == true && this.getType(key) == ReadableType.Number) this.getDouble(key).toLong() else null
+
+fun ReadableMap?.getLongOr(
+  key: String,
+  default: Long,
+): Long = getLongOrNull(key) ?: default
+
 fun ReadableMap?.getFloatOrNull(key: String): Float? =
   if (this?.hasKey(key) == true && this.getType(key) == ReadableType.Number) this.getDouble(key).toFloat() else null
 
@@ -74,4 +82,37 @@ fun ReadableArray.forEachMap(callback: (map: ReadableMap) -> Unit) {
   }
 }
 
+/**
+ * Returns a List of Strings if the key exists and points to an array of strings, or null otherwise.
+ */
+fun ReadableMap.getStringList(key: String): List<String>? {
+  if (!hasKey(key) || getType(key) != ReadableType.Array) return null
+  val array: ReadableArray = getArray(key) ?: return null
+
+  val result = mutableListOf<String>()
+  for (i in 0 until array.size()) {
+    // getString returns null if the element isn't actually a string
+    array.getString(i)?.let { result.add(it) }
+  }
+  return result
+}
+
+/**
+ * Returns a List of Ints if the key exists and points to an array of numbers, or null otherwise.
+ */
+fun ReadableMap.getIntegerList(key: String): List<Int>? {
+  if (!hasKey(key) || getType(key) != ReadableType.Array) return null
+  val array: ReadableArray = getArray(key) ?: return null
+
+  val result = mutableListOf<Int>()
+  for (i in 0 until array.size()) {
+    // getType check to skip non-number entries
+    if (array.getType(i) == ReadableType.Number) {
+      // if it's actually a float/double, this will truncate; adjust as needed
+      result.add(array.getInt(i))
+    }
+  }
+  return result
+}
+
 fun Dynamic.asMapOrNull(): ReadableMap? = if (this.type == ReadableType.Map) this.asMap() else null

package/android/src/main/java/com/reactnativestripesdk/utils/KeepJsAwakeTask.kt

@@ -37,7 +37,7 @@ internal class KeepJsAwakeTask(
 
     try {
       headlessJsTaskContext.finishTask(taskId)
-    } catch (e: AssertionError) {
+    } catch (_: AssertionError) {
       // Ignore if task already finished
       Log.w("KeepJsAwakeTask", "Tried to stop a non-existent task (id=$taskId)")
     } finally {