react-native-tvos 0.76.6-0 → 0.77.0-0

package/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.kt

@@ -8,17 +8,20 @@
 package com.facebook.react.modules.fresco
 
 import com.facebook.common.logging.FLog
+import com.facebook.drawee.backends.pipeline.DraweeConfig
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory.newBuilder
 import com.facebook.imagepipeline.core.DownsampleMode
 import com.facebook.imagepipeline.core.ImagePipeline
 import com.facebook.imagepipeline.core.ImagePipelineConfig
+import com.facebook.imagepipeline.decoder.ImageDecoderConfig
 import com.facebook.imagepipeline.listener.RequestListener
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.common.ReactConstants
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.common.ModuleDataCleaner
 import com.facebook.react.modules.network.ForwardingCookieHandler
@@ -75,10 +78,16 @@ constructor(
     val reactContext = reactApplicationContext
     reactContext.addLifecycleEventListener(this)
     if (!hasBeenInitialized()) {
-      if (config == null) {
-        config = getDefaultConfig(reactContext)
+      val pipelineConfig = config ?: getDefaultConfig(reactContext)
+      val draweeConfigBuilder = DraweeConfig.newBuilder()
+      if (ReactNativeFeatureFlags.loadVectorDrawablesOnImages()) {
+        draweeConfigBuilder.addCustomDrawableFactory(XmlFormat.getDrawableFactory())
       }
-      Fresco.initialize(reactContext.applicationContext, config)
+      Fresco.initialize(
+          reactContext.applicationContext,
+          pipelineConfig,
+          draweeConfigBuilder.build(),
+      )
       hasBeenInitialized = true
     } else if (config != null) {
       FLog.w(
@@ -105,7 +114,7 @@ constructor(
     // the 'last' ReactActivity is being destroyed, which effectively means the app is being
     // backgrounded.
     if (hasBeenInitialized() && clearOnDestroy) {
-      imagePipeline!!.clearMemoryCaches()
+      imagePipeline?.clearMemoryCaches()
     }
   }
 
@@ -123,7 +132,7 @@ constructor(
   }
 
   public companion object {
-    internal const val NAME = "FrescoModule"
+    public const val NAME: String = "FrescoModule"
     private var hasBeenInitialized = false
 
     /**
@@ -149,6 +158,12 @@ constructor(
       requestListeners.add(SystraceRequestListener())
       val client = OkHttpClientProvider.createClient()
 
+      // Add support for XML drawable images
+      val decoderConfigBuilder = ImageDecoderConfig.Builder()
+      if (ReactNativeFeatureFlags.loadVectorDrawablesOnImages()) {
+        XmlFormat.addDecodingCapability(decoderConfigBuilder, context)
+      }
+
       // make sure to forward cookies for any requests via the okHttpClient
       // so that image requests to endpoints that use cookies still work
       val container = OkHttpCompat.getCookieJarContainer(client)
@@ -156,6 +171,7 @@ constructor(
       container.setCookieJar(JavaNetCookieJar(handler))
       return newBuilder(context.applicationContext, client)
           .setNetworkFetcher(ReactOkHttpNetworkFetcher(client))
+          .setImageDecoderConfig(decoderConfigBuilder.build())
           .setDownsampleMode(DownsampleMode.AUTO)
           .setRequestListeners(requestListeners)
     }

package/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ImageCacheControl.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.modules.fresco
+
+public enum class ImageCacheControl {
+  /** Uses OkHttp's default cache control policy with no store. */
+  DEFAULT,
+  /**
+   * The data for the URL will be loaded from the originating source. No existing cache data should
+   * be used to satisfy a URL load request.
+   */
+  RELOAD,
+  /**
+   * The existing cache data will be used to satisfy a request, regardless of its age or expiration
+   * date. If there is no existing data in the cache corresponding to a URL load request, the data
+   * is loaded from the originating source.
+   */
+  FORCE_CACHE,
+  /**
+   * The existing cache data will be used to satisfy a request, regardless of its age or expiration
+   * date. If there is no existing data in the cache corresponding to a URL load request, no attempt
+   * is made to load the data from the originating source, and the load is considered to have
+   * failed.
+   */
+  ONLY_IF_CACHED,
+}

package/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.kt

@@ -16,16 +16,19 @@ public class ReactNetworkImageRequest
 private constructor(
     builder: ImageRequestBuilder,
     /** Headers for the request */
-    internal val headers: ReadableMap?
+    internal val headers: ReadableMap?,
+    internal val cacheControl: ImageCacheControl,
 ) : ImageRequest(builder) {
 
   public companion object {
     @JvmStatic
+    @JvmOverloads
     public fun fromBuilderWithHeaders(
         builder: ImageRequestBuilder,
-        headers: ReadableMap?
+        headers: ReadableMap?,
+        cacheControl: ImageCacheControl = ImageCacheControl.DEFAULT,
     ): ReactNetworkImageRequest {
-      return ReactNetworkImageRequest(builder, headers)
+      return ReactNetworkImageRequest(builder, headers, cacheControl)
     }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.kt

@@ -12,6 +12,7 @@ import com.facebook.imagepipeline.backends.okhttp3.OkHttpNetworkFetcher
 import com.facebook.imagepipeline.producers.NetworkFetcher
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.modules.network.OkHttpCompat
+import java.util.concurrent.TimeUnit
 import okhttp3.CacheControl
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -35,22 +36,35 @@ internal class ReactOkHttpNetworkFetcher(private val okHttpClient: OkHttpClient)
     fetchState.submitTime = SystemClock.elapsedRealtime()
     val uri = fetchState.uri
     var requestHeaders: Map<String, String>? = null
+    val cacheControlBuilder = CacheControl.Builder()
     if (fetchState.context.imageRequest is ReactNetworkImageRequest) {
       val networkImageRequest = fetchState.context.imageRequest as ReactNetworkImageRequest
       requestHeaders = getHeaders(networkImageRequest.headers)
+      when (networkImageRequest.cacheControl) {
+        ImageCacheControl.RELOAD -> {
+          cacheControlBuilder.noStore().noCache()
+        }
+        ImageCacheControl.FORCE_CACHE -> {
+          cacheControlBuilder.maxStale(Integer.MAX_VALUE, TimeUnit.SECONDS)
+        }
+        ImageCacheControl.ONLY_IF_CACHED -> {
+          cacheControlBuilder.onlyIfCached().maxStale(Integer.MAX_VALUE, TimeUnit.SECONDS)
+        }
+        ImageCacheControl.DEFAULT -> {
+          cacheControlBuilder.noStore()
+        }
+      }
+    } else {
+      cacheControlBuilder.noStore()
     }
     val headers = OkHttpCompat.getHeadersFromMap(requestHeaders)
     val request =
         Request.Builder()
-            .cacheControl(CacheControl.Builder().noStore().build())
+            .cacheControl(cacheControlBuilder.build())
             .url(uri.toString())
             .headers(headers)
             .get()
             .build()
     fetchWithRequest(fetchState, callback, request)
   }
-
-  private companion object {
-    private const val TAG = "ReactOkHttpNetworkFetcher"
-  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.kt

@@ -15,8 +15,8 @@ import com.facebook.systrace.Systrace
 /** Logs requests to Systrace */
 public class SystraceRequestListener : BaseRequestListener() {
   private var currentId: Int = 0
-  private var producerId: MutableMap<String, Pair<Int, String>> = mutableMapOf()
-  private var requestsId: MutableMap<String, Pair<Int, String>> = mutableMapOf()
+  private val producerId: MutableMap<String, Pair<Int, String>> = mutableMapOf()
+  private val requestsId: MutableMap<String, Pair<Int, String>> = mutableMapOf()
 
   override fun onProducerStart(requestId: String, producerName: String) {
     if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
@@ -39,8 +39,9 @@ public class SystraceRequestListener : BaseRequestListener() {
     if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
       return
     }
-    if (producerId.containsKey(requestId)) {
-      val entry = producerId[requestId]!!
+
+    val entry = producerId[requestId]
+    if (entry != null) {
       Systrace.endAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, entry.second, entry.first)
       producerId.remove(requestId)
     }
@@ -55,8 +56,9 @@ public class SystraceRequestListener : BaseRequestListener() {
     if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
       return
     }
-    if (producerId.containsKey(requestId)) {
-      val entry = producerId[requestId]!!
+
+    val entry = producerId[requestId]
+    if (entry != null) {
       Systrace.endAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, entry.second, entry.first)
       producerId.remove(requestId)
     }
@@ -70,8 +72,9 @@ public class SystraceRequestListener : BaseRequestListener() {
     if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
       return
     }
-    if (producerId.containsKey(requestId)) {
-      val entry = producerId[requestId]!!
+
+    val entry = producerId[requestId]
+    if (entry != null) {
       Systrace.endAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, entry.second, entry.first)
       producerId.remove(requestId)
     }
@@ -101,6 +104,7 @@ public class SystraceRequestListener : BaseRequestListener() {
     if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
       return
     }
+
     val entryName = StringBuilder()
     entryName.append("FRESCO_REQUEST_")
     entryName.append(request.sourceUri.toString().replace(':', '_'))
@@ -114,8 +118,9 @@ public class SystraceRequestListener : BaseRequestListener() {
     if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
       return
     }
-    if (requestsId.containsKey(requestId)) {
-      val entry = requestsId[requestId]!!
+
+    val entry = requestsId[requestId]
+    if (entry != null) {
       Systrace.endAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, entry.second, entry.first)
       requestsId.remove(requestId)
     }
@@ -130,8 +135,9 @@ public class SystraceRequestListener : BaseRequestListener() {
     if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
       return
     }
-    if (requestsId.containsKey(requestId)) {
-      val entry = requestsId[requestId]!!
+
+    val entry = requestsId[requestId]
+    if (entry != null) {
       Systrace.endAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, entry.second, entry.first)
       requestsId.remove(requestId)
     }
@@ -141,8 +147,9 @@ public class SystraceRequestListener : BaseRequestListener() {
     if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT_FRESCO)) {
       return
     }
-    if (requestsId.containsKey(requestId)) {
-      val entry = requestsId[requestId]!!
+
+    val entry = requestsId[requestId]
+    if (entry != null) {
       Systrace.endAsyncSection(Systrace.TRACE_TAG_REACT_FRESCO, entry.second, entry.first)
       requestsId.remove(requestId)
     }

package/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/XmlFormat.kt

@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.modules.fresco
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import com.facebook.common.logging.FLog
+import com.facebook.imageformat.ImageFormat
+import com.facebook.imageformat.ImageFormat.FormatChecker
+import com.facebook.imageformat.ImageFormatCheckerUtils
+import com.facebook.imagepipeline.common.ImageDecodeOptions
+import com.facebook.imagepipeline.decoder.ImageDecoder
+import com.facebook.imagepipeline.decoder.ImageDecoderConfig
+import com.facebook.imagepipeline.drawable.DrawableFactory
+import com.facebook.imagepipeline.image.CloseableImage
+import com.facebook.imagepipeline.image.DefaultCloseableImage
+import com.facebook.imagepipeline.image.EncodedImage
+import com.facebook.imagepipeline.image.QualityInfo
+
+public object XmlFormat {
+
+  public fun addDecodingCapability(
+      builder: ImageDecoderConfig.Builder,
+      context: Context,
+  ): ImageDecoderConfig.Builder {
+    return builder.addDecodingCapability(
+        XmlFormat.FORMAT,
+        XmlFormat.XmlFormatChecker(),
+        XmlFormat.XmlFormatDecoder(context),
+    )
+  }
+
+  public fun getDrawableFactory(): DrawableFactory {
+    return XmlDrawableFactory()
+  }
+
+  private val FORMAT: ImageFormat = ImageFormat("XML", "xml")
+  private const val TAG: String = "XmlFormat"
+  /**
+   * These are the first 4 bytes of a binary XML file. We can only support binary XML files and not
+   * raw XML files because Android explicitly disallows raw XML files when inflating drawables.
+   * Binary XML files are created at build time by Android's AAPT.
+   *
+   * @see
+   *   https://developer.android.com/reference/android/view/LayoutInflater#inflate(org.xmlpull.v1.XmlPullParser,%20android.view.ViewGroup)
+   */
+  private val BINARY_XML_HEADER: ByteArray =
+      byteArrayOf(
+          3.toByte(),
+          0.toByte(),
+          8.toByte(),
+          0.toByte(),
+      )
+
+  private class XmlFormatChecker : FormatChecker {
+    override val headerSize: Int = BINARY_XML_HEADER.size
+
+    override fun determineFormat(headerBytes: ByteArray, headerSize: Int): ImageFormat {
+      return when {
+        headerSize < BINARY_XML_HEADER.size -> ImageFormat.UNKNOWN
+        ImageFormatCheckerUtils.startsWithPattern(headerBytes, BINARY_XML_HEADER) -> FORMAT
+        else -> ImageFormat.UNKNOWN
+      }
+    }
+  }
+
+  private class CloseableXmlImage(val name: String, val drawable: Drawable) :
+      DefaultCloseableImage() {
+    private var closed = false
+
+    override fun getSizeInBytes(): Int {
+      return getWidth() * getHeight() * 4 // 4 bytes ARGB per pixel
+    }
+
+    override fun close() {
+      closed = true
+    }
+
+    override fun isClosed(): Boolean {
+      return closed
+    }
+
+    override fun getWidth(): Int {
+      return drawable.intrinsicWidth.takeIf { it >= 0 } ?: 0
+    }
+
+    override fun getHeight(): Int {
+      return drawable.intrinsicHeight.takeIf { it >= 0 } ?: 0
+    }
+  }
+
+  private class XmlFormatDecoder(private val context: Context) : ImageDecoder {
+    override fun decode(
+        encodedImage: EncodedImage,
+        length: Int,
+        qualityInfo: QualityInfo,
+        options: ImageDecodeOptions
+    ): CloseableImage? {
+      return try {
+        val xmlResourceName = encodedImage.source ?: error("No source in encoded image")
+        // Use insecure URI parser since we do not care about the validity of the URI
+        val xmlResource = Uri.parse(xmlResourceName)
+        // Only support binary XML files from resources, not assets or raw files
+        val xmlResourceId = parseImageSourceResourceId(xmlResource)
+        // Use application context to avoid leaking the activity
+        val drawable = context.applicationContext.resources.getDrawable(xmlResourceId, null)
+        CloseableXmlImage(xmlResourceName, drawable)
+      } catch (error: Throwable) {
+        FLog.e(TAG, "Cannot decode xml ${error}", error)
+        null
+      }
+    }
+
+    /**
+     * This parsing implementation is only designed to work with URI's that have been generated by
+     * the ResourceDrawableIdHelper that ImageSource uses. It will ignore package names and schemes
+     * in its quest to extract a basic integer resource ID.
+     *
+     * ResourceDrawableIdHelper generates URIs in the format of res:/[resourceId]
+     *
+     * @throws IllegalStateException if the resource ID cannot be parsed from the provided uri
+     */
+    private fun parseImageSourceResourceId(xmlResource: Uri): Int {
+      return xmlResource.pathSegments.lastOrNull()?.toIntOrNull() ?: error("Invalid resource id")
+    }
+  }
+
+  private class XmlDrawableFactory : DrawableFactory {
+    override fun supportsImageType(image: CloseableImage): Boolean {
+      return image is CloseableXmlImage
+    }
+
+    override fun createDrawable(image: CloseableImage): Drawable? {
+      return (image as CloseableXmlImage).drawable
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.kt

@@ -7,7 +7,6 @@
 
 package com.facebook.react.modules.i18nmanager
 
-import android.os.Build
 import com.facebook.fbreact.specs.NativeI18nManagerSpec
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
@@ -18,7 +17,7 @@ public class I18nManagerModule(context: ReactApplicationContext?) : NativeI18nMa
   override public fun getTypedExportedConstants(): Map<String, Any> {
     val context = getReactApplicationContext()
     val locale = context.resources.configuration.locales[0]
-        
+
     return mapOf(
         "isRTL" to I18nUtil.instance.isRTL(context),
         "doLeftAndRightSwapInRTL" to I18nUtil.instance.doLeftAndRightSwapInRTL(context),
@@ -36,4 +35,8 @@ public class I18nManagerModule(context: ReactApplicationContext?) : NativeI18nMa
   override fun swapLeftAndRightInRTL(value: Boolean) {
     I18nUtil.instance.swapLeftAndRightInRTL(getReactApplicationContext(), value)
   }
+
+  public companion object {
+    public const val NAME: String = NativeI18nManagerSpec.NAME
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.kt

@@ -249,8 +249,8 @@ public class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventLis
             val result: WritableMap = Arguments.createMap()
             val imagePipeline: ImagePipeline = this@ImageLoaderModule.imagePipeline
             for (i in 0 until uris.size()) {
-              val uriString: String = uris.getString(i)
-              if (uriString.isNotEmpty()) {
+              val uriString = uris.getString(i)
+              if (!uriString.isNullOrEmpty()) {
                 val uri = Uri.parse(uriString)
                 if (imagePipeline.isInBitmapMemoryCache(uri)) {
                   result.putString(uriString, "memory")