react-native-tvos 0.84.1-0 → 0.85.0-0

package/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.kt

@@ -7,7 +7,7 @@
 
 package com.facebook.react.bridge
 
-import androidx.core.util.Pools
+import androidx.core.util.Pools.SimplePool
 
 /** Implementation of Dynamic wrapping a ReadableArray. */
 internal class DynamicFromArray private constructor() : Dynamic {
@@ -17,7 +17,7 @@ internal class DynamicFromArray private constructor() : Dynamic {
   override fun recycle() {
     array = null
     index = -1
-    pool.release(this)
+    pool.get()?.release(this)
   }
 
   override val type: ReadableType
@@ -48,11 +48,16 @@ internal class DynamicFromArray private constructor() : Dynamic {
       array?.getString(index) ?: throw IllegalStateException("This dynamic value has been recycled")
 
   companion object {
-    private val pool = Pools.SimplePool<DynamicFromArray>(10)
+    private val pool: ThreadLocal<SimplePool<DynamicFromArray>> =
+        object : ThreadLocal<SimplePool<DynamicFromArray>>() {
+          override fun initialValue(): SimplePool<DynamicFromArray> {
+            return SimplePool(10)
+          }
+        }
 
     @JvmStatic
     fun create(array: ReadableArray, index: Int): DynamicFromArray {
-      val dynamic = pool.acquire() ?: DynamicFromArray()
+      val dynamic = pool.get()?.acquire() ?: DynamicFromArray()
       dynamic.array = array
       dynamic.index = index
       return dynamic

package/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.kt

@@ -53,6 +53,14 @@ internal class JavaMethodWrapper(
   private var arguments: Array<Any?>? = null
   private var jsArgumentsNeeded = 0
 
+  val signature: String?
+    get() {
+      if (!argumentsProcessed) {
+        processArguments()
+      }
+      return checkNotNull(internalSignature)
+    }
+
   init {
     method.isAccessible = true
     parameterTypes = method.parameterTypes
@@ -86,14 +94,6 @@ internal class JavaMethodWrapper(
     }
   }
 
-  val signature: String?
-    get() {
-      if (!argumentsProcessed) {
-        processArguments()
-      }
-      return checkNotNull(internalSignature)
-    }
-
   private fun buildSignature(method: Method, paramTypes: Array<Class<*>>, isSync: Boolean): String =
       buildString(paramTypes.size + 2) {
         if (isSync) {
@@ -249,13 +249,6 @@ internal class JavaMethodWrapper(
   }
 
   companion object {
-    init {
-      LegacyArchitectureLogger.assertLegacyArchitecture(
-          "JavaMethodWrapper",
-          LegacyArchitectureLogLevel.ERROR,
-      )
-    }
-
     private val ARGUMENT_EXTRACTOR_BOOLEAN: ArgumentExtractor<Boolean> =
         object : ArgumentExtractor<Boolean>() {
           @Suppress("DEPRECATION")
@@ -388,6 +381,13 @@ internal class JavaMethodWrapper(
     private val DEBUG =
         PrinterHolder.printer.shouldDisplayLogMessage(ReactDebugOverlayTags.BRIDGE_CALLS)
 
+    init {
+      LegacyArchitectureLogger.assertLegacyArchitecture(
+          "JavaMethodWrapper",
+          LegacyArchitectureLogLevel.ERROR,
+      )
+    }
+
     private fun paramTypeToChar(paramClass: Class<*>): Char {
       val tryCommon = commonTypeToChar(paramClass)
       if (tryCommon != '\u0000') {

package/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.kt

@@ -168,13 +168,15 @@ public class JavaOnlyMap() : ReadableMap, WritableMap {
   override fun toString(): String = backingMap.toString()
 
   override fun equals(other: Any?): Boolean {
-    return if (this === other) {
-      true
-    } else if (other == null || javaClass != other.javaClass) {
-      false
-    } else {
-      backingMap == (other as JavaOnlyMap).backingMap
+    if (this === other) {
+      return true
     }
+    if (other !is JavaOnlyMap) {
+      return false
+    }
+    val thisBackingMap = backingMap
+    val otherBackingMap = other.backingMap
+    return thisBackingMap == otherBackingMap
   }
 
   override fun hashCode(): Int = backingMap.hashCode()

package/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.kt

@@ -46,7 +46,9 @@ public class NativeModuleRegistry(
   ) // This is needed till there are Java Consumer of this API inside React
   // Native
   internal fun registerModules(newRegister: NativeModuleRegistry) {
-    check(reactApplicationContext == newRegister.reactApplicationContext) {
+    val ownContext = reactApplicationContext
+    val otherContext = newRegister.reactApplicationContext
+    check(ownContext == otherContext) {
       "Extending native modules with non-matching application contexts."
     }
 

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java

@@ -50,6 +50,7 @@ public abstract class ReactContext extends ContextWrapper {
       new CopyOnWriteArraySet<>();
   private final CopyOnWriteArraySet<WindowFocusChangeListener> mWindowFocusEventListeners =
       new CopyOnWriteArraySet<>();
+  private final ScrollEndedListeners mScrollEndedListeners = new ScrollEndedListeners();
 
   private LifecycleState mLifecycleState = LifecycleState.BEFORE_CREATE;
 
@@ -195,6 +196,15 @@ public abstract class ReactContext extends ContextWrapper {
     return mLifecycleState;
   }
 
+  /**
+   * This allows scroll views to notify NativeAnimatedModule when user-driven scrolling ends.
+   *
+   * @return The ScrollEndedListeners instance
+   */
+  public ScrollEndedListeners getScrollEndedListeners() {
+    return mScrollEndedListeners;
+  }
+
   public void addLifecycleEventListener(final LifecycleEventListener listener) {
     mLifecycleEventListeners.add(listener);
     if (hasActiveReactInstance() || isBridgeless()) {

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ScrollEndedListener.kt

@@ -0,0 +1,70 @@
+/*
+ * 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.bridge
+
+import android.view.ViewGroup
+import java.lang.ref.WeakReference
+import java.util.concurrent.CopyOnWriteArrayList
+
+/** Listener interface for scroll ended events. This is a native only event. */
+public interface ScrollEndedListener {
+  /**
+   * Called when user-driven scrolling ends.
+   *
+   * @param scrollView The scroll view that has stopped scrolling
+   */
+  public fun onScrollEnded(scrollView: ViewGroup)
+}
+
+/**
+ * Registry for managing ScrollEndedListener instances. This provides a decoupled mechanism for
+ * scroll views to notify interested parties (like NativeAnimatedModule) when user-driven scrolling
+ * ends, without creating circular dependencies between modules.
+ *
+ * This class is instantiated per ReactContext and can be accessed via
+ * [com.facebook.react.bridge.ReactContext.getScrollEndedListeners].
+ */
+public class ScrollEndedListeners {
+  private val listeners = CopyOnWriteArrayList<WeakReference<ScrollEndedListener>>()
+
+  /**
+   * Adds a scroll ended listener. This listener is called when user-driven scrolling ends.
+   *
+   * @param listener The listener to add
+   */
+  public fun addListener(listener: ScrollEndedListener) {
+    listeners.add(WeakReference(listener))
+  }
+
+  /**
+   * Removes a scroll ended listener.
+   *
+   * @param listener The listener to remove
+   */
+  public fun removeListener(listener: ScrollEndedListener) {
+    val toRemove = ArrayList<WeakReference<ScrollEndedListener>>()
+    for (ref in listeners) {
+      val target = ref.get()
+      if (target == null || target == listener) {
+        toRemove.add(ref)
+      }
+    }
+    listeners.removeAll(toRemove)
+  }
+
+  /**
+   * Notifies all registered listeners that user-driven scrolling has ended.
+   *
+   * @param scrollView The scroll view that has stopped scrolling
+   */
+  public fun notifyScrollEnded(scrollView: ViewGroup) {
+    for (listenerRef in listeners) {
+      listenerRef.get()?.onScrollEnded(scrollView)
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/common/assets/ReactFontManager.kt

@@ -33,6 +33,10 @@ public class ReactFontManager {
   private val fontCache: MutableMap<String, AssetFontFamily> = mutableMapOf()
   private val customTypefaceCache: MutableMap<String, Typeface> = mutableMapOf()
 
+  /** The set of font family names that have been registered via [addCustomFont]. */
+  public val customFontFamilies: Set<String>
+    get() = customTypefaceCache.keys.toSet()
+
   public fun getTypeface(
       fontFamilyName: String,
       style: Int,

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt

@@ -39,6 +39,10 @@ private constructor(
   override var count: Int = 0
     private set
 
+  // returns the relative offset of the first byte of dynamic data
+  private val offsetForDynamicData: Int
+    get() = getKeyOffsetForBucketIndex(count)
+
   init {
     readHeader()
   }
@@ -56,10 +60,6 @@ private constructor(
     count = readUnsignedShort(buffer.position()).toInt()
   }
 
-  // returns the relative offset of the first byte of dynamic data
-  private val offsetForDynamicData: Int
-    get() = getKeyOffsetForBucketIndex(count)
-
   /**
    * @param intKey Key to search for
    * @return the "bucket index" for a key or -1 if not found. It uses a binary search algorithm

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHost.kt

@@ -71,43 +71,45 @@ public object DefaultReactHost {
       exceptionHandler: (Exception) -> Unit = { throw it },
       bindingsInstaller: BindingsInstaller? = null,
   ): ReactHost {
-    if (reactHost == null) {
+    reactHost?.let {
+      return it
+    }
 
-      val bundleLoader =
-          if (jsBundleFilePath != null) {
-            if (jsBundleFilePath.startsWith("assets://")) {
-              JSBundleLoader.createAssetLoader(context, jsBundleFilePath, true)
-            } else {
-              JSBundleLoader.createFileLoader(jsBundleFilePath)
-            }
+    val bundleLoader =
+        if (jsBundleFilePath != null) {
+          if (jsBundleFilePath.startsWith("assets://")) {
+            JSBundleLoader.createAssetLoader(context, jsBundleFilePath, true)
           } else {
-            JSBundleLoader.createAssetLoader(context, "assets://$jsBundleAssetPath", true)
+            JSBundleLoader.createFileLoader(jsBundleFilePath)
           }
-      val defaultTmmDelegateBuilder = DefaultTurboModuleManagerDelegate.Builder()
-      cxxReactPackageProviders.forEach { defaultTmmDelegateBuilder.addCxxReactPackage(it) }
-      val defaultReactHostDelegate =
-          DefaultReactHostDelegate(
-              jsMainModulePath = jsMainModulePath,
-              jsBundleLoader = bundleLoader,
-              reactPackages = packageList,
-              jsRuntimeFactory = jsRuntimeFactory ?: HermesInstance(),
-              bindingsInstaller = bindingsInstaller,
-              turboModuleManagerDelegateBuilder = defaultTmmDelegateBuilder,
-              exceptionHandler = exceptionHandler,
-          )
-      val componentFactory = ComponentFactory()
-      DefaultComponentsRegistry.register(componentFactory)
-      // TODO: T164788699 find alternative of accessing ReactHostImpl for initialising reactHost
-      reactHost =
-          ReactHostImpl(
-              context,
-              defaultReactHostDelegate,
-              componentFactory,
-              true /* allowPackagerServerAccess */,
-              useDevSupport,
-          )
-    }
-    return reactHost as ReactHost
+        } else {
+          JSBundleLoader.createAssetLoader(context, "assets://$jsBundleAssetPath", true)
+        }
+    val defaultTmmDelegateBuilder = DefaultTurboModuleManagerDelegate.Builder()
+    cxxReactPackageProviders.forEach { defaultTmmDelegateBuilder.addCxxReactPackage(it) }
+    val defaultReactHostDelegate =
+        DefaultReactHostDelegate(
+            jsMainModulePath = jsMainModulePath,
+            jsBundleLoader = bundleLoader,
+            reactPackages = packageList,
+            jsRuntimeFactory = jsRuntimeFactory ?: HermesInstance(),
+            bindingsInstaller = bindingsInstaller,
+            turboModuleManagerDelegateBuilder = defaultTmmDelegateBuilder,
+            exceptionHandler = exceptionHandler,
+        )
+    val componentFactory = ComponentFactory()
+    DefaultComponentsRegistry.register(componentFactory)
+    // TODO: T164788699 find alternative of accessing ReactHostImpl for initialising reactHost
+    val newReactHost =
+        ReactHostImpl(
+            context,
+            defaultReactHostDelegate,
+            componentFactory,
+            true /* allowPackagerServerAccess */,
+            useDevSupport,
+        )
+    reactHost = newReactHost
+    return newReactHost
   }
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.kt

@@ -169,12 +169,12 @@ public class BundleDownloader public constructor(private val client: OkHttpClien
           DebugServerException(
               ("""
                     Error while reading multipart response.
-                    
+
                     Response body was empty: ${response.code()}
-                    
+
                     URL: $url
-                    
-                    
+
+
                     """
                   .trimIndent())
           )
@@ -231,7 +231,11 @@ public class BundleDownloader public constructor(private val client: OkHttpClien
                     if (progress.has("total")) {
                       total = progress.getInt("total")
                     }
-                    callback.onProgress(status, done, total)
+                    var percent: Int? = null
+                    if (progress.has("percent")) {
+                      percent = progress.getInt("percent")
+                    }
+                    callback.onProgress(status, done, total, percent)
                   } catch (e: JSONException) {
                     FLog.e(ReactConstants.TAG, "Error parsing progress JSON. $e")
                   }
@@ -248,6 +252,7 @@ public class BundleDownloader public constructor(private val client: OkHttpClien
                       "Downloading",
                       (loaded / 1024).toInt(),
                       (total / 1024).toInt(),
+                      null,
                   )
                 }
               }
@@ -258,12 +263,12 @@ public class BundleDownloader public constructor(private val client: OkHttpClien
           DebugServerException(
               ("""
                     Error while reading multipart response.
-                    
+
                     Response code: ${response.code()}
-                    
+
                     URL: $url
-                    
-                    
+
+
                     """
                   .trimIndent())
           )

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/CxxInspectorPackagerConnection.kt

@@ -14,14 +14,13 @@ import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.proguard.annotations.DoNotStripAny
 import com.facebook.react.common.annotations.VisibleForTesting
+import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import com.facebook.soloader.SoLoader
 import java.io.Closeable
 import java.nio.ByteBuffer
 import java.nio.charset.StandardCharsets
 import java.util.ArrayDeque
 import java.util.Queue
-import java.util.concurrent.TimeUnit
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.WebSocket
@@ -173,12 +172,7 @@ internal class CxxInspectorPackagerConnection(
 
   /** Java implementation of the C++ InspectorPackagerConnectionDelegate interface. */
   private class DelegateImpl {
-    private val httpClient =
-        OkHttpClient.Builder()
-            .connectTimeout(10, TimeUnit.SECONDS)
-            .writeTimeout(10, TimeUnit.SECONDS)
-            .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
-            .build()
+    private val httpClient = DevSupportHttpClient.websocketClient
 
     private val handler = Handler(Looper.getMainLooper())
 

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevLoadingViewImplementation.kt

@@ -51,13 +51,14 @@ public class DefaultDevLoadingViewImplementation(
     }
   }
 
-  override fun updateProgress(status: String?, done: Int?, total: Int?) {
+  override fun updateProgress(status: String?, done: Int?, total: Int?, percent: Int?) {
     if (!isEnabled) {
       return
     }
     UiThreadUtil.runOnUiThread {
       val percentage =
-          if (done != null && total != null && total > 0)
+          if (percent != null) String.format(Locale.getDefault(), " %d%%", percent)
+          else if (done != null && total != null && total > 0)
               String.format(Locale.getDefault(), " %.1f%%", done.toFloat() / total * 100)
           else ""
       devLoadingView?.text =

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.kt

@@ -21,6 +21,7 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.devsupport.InspectorFlags.getFuseboxEnabled
 import com.facebook.react.devsupport.InspectorFlags.getIsProfilingBuild
+import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings
@@ -39,7 +40,6 @@ import java.io.UnsupportedEncodingException
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
 import java.util.Locale
-import java.util.concurrent.TimeUnit
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.OkHttpClient
@@ -79,19 +79,15 @@ public open class DevServerHelper(
   }
 
   public val websocketProxyURL: String
-    get() = "ws://${packagerConnectionSettings.debugServerHost}/debugger-proxy?role=client"
+    get() =
+        "${DevSupportHttpClient.wsScheme(packagerConnectionSettings.debugServerHost)}://${packagerConnectionSettings.debugServerHost}/debugger-proxy?role=client"
 
   private enum class BundleType(val typeID: String) {
     BUNDLE("bundle"),
     MAP("map"),
   }
 
-  private val client: OkHttpClient =
-      OkHttpClient.Builder()
-          .connectTimeout(HTTP_CONNECT_TIMEOUT_MS.toLong(), TimeUnit.MILLISECONDS)
-          .readTimeout(0, TimeUnit.MILLISECONDS)
-          .writeTimeout(0, TimeUnit.MILLISECONDS)
-          .build()
+  private val client: OkHttpClient = DevSupportHttpClient.httpClient
   private val bundleDownloader: BundleDownloader = BundleDownloader(client)
   private val packagerStatusCheck: PackagerStatusCheck = PackagerStatusCheck(client)
   private val packageName: String = applicationContext.packageName
@@ -129,7 +125,8 @@ public open class DevServerHelper(
     get() =
         String.format(
             Locale.US,
-            "http://%s/inspector/device?name=%s&app=%s&device=%s&profiling=%b",
+            "%s://%s/inspector/device?name=%s&app=%s&device=%s&profiling=%b",
+            DevSupportHttpClient.httpScheme(packagerConnectionSettings.debugServerHost),
             packagerConnectionSettings.debugServerHost,
             Uri.encode(getFriendlyDeviceName()),
             Uri.encode(packageName),
@@ -292,7 +289,8 @@ public open class DevServerHelper(
     }
     return (String.format(
         Locale.US,
-        "http://%s/%s.%s?platform=android&dev=%s&lazy=%s&minify=%s&app=%s&modulesOnly=%s&runModule=%s",
+        "%s://%s/%s.%s?platform=android&dev=%s&lazy=%s&minify=%s&app=%s&modulesOnly=%s&runModule=%s",
+        DevSupportHttpClient.httpScheme(host),
         host,
         mainModuleID,
         type.typeID,
@@ -367,7 +365,8 @@ public open class DevServerHelper(
     requestUrlBuilder.append(
         String.format(
             Locale.US,
-            "http://%s/open-debugger?device=%s",
+            "%s://%s/open-debugger?device=%s",
+            DevSupportHttpClient.httpScheme(packagerConnectionSettings.debugServerHost),
             packagerConnectionSettings.debugServerHost,
             Uri.encode(inspectorDeviceId),
         )
@@ -397,7 +396,6 @@ public open class DevServerHelper(
   }
 
   private companion object {
-    private const val HTTP_CONNECT_TIMEOUT_MS = 5000
     private const val DEBUGGER_MSG_DISABLE = "{ \"id\":1,\"method\":\"Debugger.disable\" }"
 
     private fun getSHA256(string: String): String {
@@ -446,7 +444,13 @@ public open class DevServerHelper(
         FLog.w(ReactConstants.TAG, "Resource path should not begin with `/`, removing it.")
         resourcePath = resourcePath.substring(1)
       }
-      return String.format(Locale.US, "http://%s/%s", host, resourcePath)
+      return String.format(
+          Locale.US,
+          "%s://%s/%s",
+          DevSupportHttpClient.httpScheme(host),
+          host,
+          resourcePath,
+      )
     }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt

@@ -789,8 +789,8 @@ public abstract class DevSupportManagerBase(
               callback.onSuccess(bundleLoader)
             }
 
-            override fun onProgress(status: String?, done: Int?, total: Int?) {
-              devLoadingViewManager?.updateProgress(status, done, total)
+            override fun onProgress(status: String?, done: Int?, total: Int?, percent: Int?) {
+              devLoadingViewManager?.updateProgress(status, done, total, percent)
             }
 
             override fun onFailure(cause: Exception) {
@@ -856,9 +856,9 @@ public abstract class DevSupportManagerBase(
             callback.onSuccess()
           }
 
-          override fun onProgress(status: String?, done: Int?, total: Int?) {
-            devLoadingViewManager?.updateProgress(status, done, total)
-            devBundleDownloadListener?.onProgress(status, done, total)
+          override fun onProgress(status: String?, done: Int?, total: Int?, percent: Int?) {
+            devLoadingViewManager?.updateProgress(status, done, total, percent)
+            devBundleDownloadListener?.onProgress(status, done, total, percent)
           }
 
           override fun onFailure(cause: Exception) {

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.kt

@@ -11,10 +11,10 @@ package com.facebook.react.devsupport
 
 import com.facebook.common.logging.FLog
 import com.facebook.react.common.ReactConstants
+import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback
 import java.io.IOException
 import java.util.Locale
-import java.util.concurrent.TimeUnit
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.OkHttpClient
@@ -22,22 +22,9 @@ import okhttp3.Request
 import okhttp3.Response
 
 /** Use this class to check if the JavaScript packager is running on the provided host. */
-internal class PackagerStatusCheck {
+internal class PackagerStatusCheck(private val client: OkHttpClient) {
 
-  private val client: OkHttpClient
-
-  constructor() {
-    client =
-        OkHttpClient.Builder()
-            .connectTimeout(HTTP_CONNECT_TIMEOUT_MS.toLong(), TimeUnit.MILLISECONDS)
-            .readTimeout(0, TimeUnit.MILLISECONDS)
-            .writeTimeout(0, TimeUnit.MILLISECONDS)
-            .build()
-  }
-
-  constructor(client: OkHttpClient) {
-    this.client = client
-  }
+  constructor() : this(DevSupportHttpClient.httpClient)
 
   fun run(host: String, callback: PackagerStatusCallback) {
     val statusURL = createPackagerStatusURL(host)
@@ -92,10 +79,14 @@ internal class PackagerStatusCheck {
 
   private companion object {
     private const val PACKAGER_OK_STATUS = "packager-status:running"
-    private const val HTTP_CONNECT_TIMEOUT_MS = 5_000
-    private const val PACKAGER_STATUS_URL_TEMPLATE = "http://%s/status"
+    private const val PACKAGER_STATUS_URL_TEMPLATE = "%s://%s/status"
 
     private fun createPackagerStatusURL(host: String): String =
-        String.format(Locale.US, PACKAGER_STATUS_URL_TEMPLATE, host)
+        String.format(
+            Locale.US,
+            PACKAGER_STATUS_URL_TEMPLATE,
+            DevSupportHttpClient.httpScheme(host),
+            host,
+        )
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxContentView.kt

@@ -33,12 +33,12 @@ import android.widget.TextView
 import com.facebook.common.logging.FLog
 import com.facebook.react.R
 import com.facebook.react.common.ReactConstants
+import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.facebook.react.devsupport.interfaces.ErrorType
 import com.facebook.react.devsupport.interfaces.RedBoxHandler
 import com.facebook.react.devsupport.interfaces.StackFrame
 import okhttp3.MediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
 import org.json.JSONObject
@@ -165,7 +165,7 @@ internal class RedBoxContentView(
                 .query(null)
                 .build()
                 .toString()
-        val client = OkHttpClient()
+        val client = DevSupportHttpClient.httpClient
         for (frame in stackFrames) {
           val payload = stackFrameToJson(checkNotNull(frame)).toString()
           val body: RequestBody = RequestBody.create(JSON, payload)