react-native-tvos 0.78.0-0rc4 → 0.79.0-0

package/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.kt

@@ -34,26 +34,26 @@ internal class AppStateModule(reactContext: ReactApplicationContext) :
   public override fun getTypedExportedConstants(): Map<String, Any> =
       mapOf(INITIAL_STATE to appState)
 
-  public override fun getCurrentAppState(success: Callback, error: Callback?) {
+  override fun getCurrentAppState(success: Callback, error: Callback?) {
     success.invoke(createAppStateEventMap())
   }
 
-  public override fun onHostResume() {
+  override fun onHostResume() {
     appState = APP_STATE_ACTIVE
     sendAppStateChangeEvent()
   }
 
-  public override fun onHostPause() {
+  override fun onHostPause() {
     appState = APP_STATE_BACKGROUND
     sendAppStateChangeEvent()
   }
 
-  public override fun onHostDestroy() {
+  override fun onHostDestroy() {
     // do not set state to destroyed, do not send an event. By the current implementation, the
     // catalyst instance is going to be immediately dropped, and all JS calls with it.
   }
 
-  public override fun onWindowFocusChange(hasFocus: Boolean) {
+  override fun onWindowFocusChange(hasFocus: Boolean) {
     sendEvent("appStateFocusChange", hasFocus)
   }
 
@@ -75,23 +75,23 @@ internal class AppStateModule(reactContext: ReactApplicationContext) :
     sendEvent("appStateDidChange", createAppStateEventMap())
   }
 
-  public override fun addListener(eventName: String?) {
+  override fun addListener(eventName: String?) {
     // iOS only
   }
 
-  public override fun removeListeners(count: Double) {
+  override fun removeListeners(count: Double) {
     // iOS only
   }
 
-  public override fun invalidate() {
+  override fun invalidate() {
     super.invalidate()
     getReactApplicationContext().removeLifecycleEventListener(this)
   }
 
-  public companion object {
-    public const val NAME: String = NativeAppStateSpec.NAME
-    public const val APP_STATE_ACTIVE: String = "active"
-    public const val APP_STATE_BACKGROUND: String = "background"
+  companion object {
+    const val NAME: String = NativeAppStateSpec.NAME
+    const val APP_STATE_ACTIVE: String = "active"
+    const val APP_STATE_BACKGROUND: String = "background"
     private const val INITIAL_STATE: String = "initialAppState"
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobCollector.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.blob
+
+import com.facebook.react.bridge.JavaScriptContextHolder
+import com.facebook.react.bridge.ReactContext
+import com.facebook.soloader.SoLoader
+
+internal object BlobCollector {
+  init {
+    SoLoader.loadLibrary("reactnativeblob")
+  }
+
+  @JvmStatic
+  fun install(reactContext: ReactContext, blobModule: BlobModule) {
+    reactContext.runOnJSQueueThread {
+      val jsContext: JavaScriptContextHolder? = reactContext.getJavaScriptContextHolder()
+      // When debugging in chrome the JS context is not available.
+      if (jsContext != null && jsContext.get() != 0L) {
+        nativeInstall(blobModule, jsContext.get())
+      }
+    }
+  }
+
+  private external fun nativeInstall(blobModule: Any, jsContext: Long)
+}

package/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.kt

@@ -32,7 +32,7 @@ internal class ImageStoreManager(reactContext: ReactApplicationContext) :
    * @param success callback to be invoked with the base64 string as the only argument
    * @param error callback to be invoked on error (e.g. file not found, not readable etc.)
    */
-  override public fun getBase64ForTag(uri: String, success: Callback, error: Callback) {
+  override fun getBase64ForTag(uri: String, success: Callback, error: Callback) {
     val executor = Executors.newSingleThreadExecutor()
     executor.execute {
       try {
@@ -52,8 +52,8 @@ internal class ImageStoreManager(reactContext: ReactApplicationContext) :
     }
   }
 
-  public companion object {
-    public const val NAME: String = NativeImageStoreAndroidSpec.NAME
+  companion object {
+    const val NAME: String = NativeImageStoreAndroidSpec.NAME
 
     private const val BUFFER_SIZE = 8_192
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevMenuModule.kt

@@ -32,10 +32,6 @@ public class DevMenuModule(
     }
   }
 
-  override fun debugRemotely(enableDebug: Boolean) {
-    devSupportManager.setRemoteJSDebugEnabled(enableDebug)
-  }
-
   override fun setProfilingEnabled(enabled: Boolean) {
     // iOS only
   }

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.kt

@@ -40,10 +40,6 @@ public class DevSettingsModule(
     devSupportManager.setHotModuleReplacementEnabled(isHotLoadingEnabled)
   }
 
-  override fun setIsDebuggingRemotely(isDebugginRemotelyEnabled: Boolean) {
-    devSupportManager.setRemoteJSDebugEnabled(isDebugginRemotelyEnabled)
-  }
-
   override fun setProfilingEnabled(isProfilingEnabled: Boolean) {
     devSupportManager.setFpsDebugEnabled(isProfilingEnabled)
   }

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.kt

@@ -18,7 +18,7 @@ import com.facebook.react.module.annotations.ReactModule
 @ReactModule(name = NativeSourceCodeSpec.NAME)
 public class SourceCodeModule(reactContext: ReactApplicationContext) :
     NativeSourceCodeSpec(reactContext) {
-  override protected fun getTypedExportedConstants(): Map<String, Any> =
+  protected override fun getTypedExportedConstants(): Map<String, Any> =
       mapOf(
           "scriptURL" to
               Assertions.assertNotNull<String>(

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.kt

@@ -32,9 +32,6 @@ public interface DeveloperSettings {
   /** Whether Nuclide JS debugging is enabled. */
   public var isDeviceDebugEnabled: Boolean
 
-  /** Whether remote JS debugging is enabled. */
-  public var isRemoteJSDebugEnabled: Boolean
-
   /** Whether Start Sampling Profiler on App Start is enabled. */
   @Deprecated(
       "Legacy sampling profiler is no longer supported - This field will be removed in React Native 0.77")

package/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.kt

@@ -38,7 +38,7 @@ public class DeviceInfoModule : NativeDeviceInfoSpec, LifecycleEventListener {
     fontScale = context.resources.configuration.fontScale
   }
 
-  override public fun getTypedExportedConstants(): Map<String, Any> {
+  public override fun getTypedExportedConstants(): Map<String, Any> {
     val displayMetrics = getDisplayMetricsWritableMap(fontScale.toDouble())
 
     // Cache the initial dimensions for later comparison in emitUpdateDimensionsEvent

package/ReactAndroid/src/main/java/com/facebook/react/modules/devloading/DevLoadingModule.kt

@@ -30,15 +30,15 @@ internal class DevLoadingModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  public override fun showMessage(message: String, color: Double?, backgroundColor: Double?) {
-    UiThreadUtil.runOnUiThread(Runnable { devLoadingViewManager?.showMessage(message) })
+  override fun showMessage(message: String, color: Double?, backgroundColor: Double?) {
+    UiThreadUtil.runOnUiThread { devLoadingViewManager?.showMessage(message) }
   }
 
-  public override fun hide() {
-    UiThreadUtil.runOnUiThread(Runnable { devLoadingViewManager?.hide() })
+  override fun hide() {
+    UiThreadUtil.runOnUiThread { devLoadingViewManager?.hide() }
   }
 
-  public companion object {
-    public const val NAME: String = NativeDevLoadingViewSpec.NAME
+  companion object {
+    const val NAME: String = NativeDevLoadingViewSpec.NAME
   }
 }

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

@@ -20,7 +20,6 @@ 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
@@ -164,9 +163,7 @@ constructor(
               .setNetworkFetcher(ReactOkHttpNetworkFetcher(client))
               .setDownsampleMode(DownsampleMode.AUTO)
               .setRequestListeners(requestListeners)
-      builder
-          .experiment()
-          .setBinaryXmlEnabled(ReactNativeFeatureFlags.loadVectorDrawablesOnImages())
+      builder.experiment().setBinaryXmlEnabled(true)
       return builder
     }
   }

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

@@ -13,7 +13,7 @@ import com.facebook.imagepipeline.request.ImageRequest
 import com.facebook.systrace.Systrace
 
 /** Logs requests to Systrace */
-public class SystraceRequestListener : BaseRequestListener() {
+internal class SystraceRequestListener : BaseRequestListener() {
   private var currentId: Int = 0
   private val producerId: MutableMap<String, Pair<Int, String>> = mutableMapOf()
   private val requestsId: MutableMap<String, Pair<Int, String>> = mutableMapOf()

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

@@ -14,7 +14,7 @@ import com.facebook.react.module.annotations.ReactModule
 /** [NativeModule] that allows JS to set allowRTL and get isRTL status. */
 @ReactModule(name = NativeI18nManagerSpec.NAME)
 public class I18nManagerModule(context: ReactApplicationContext?) : NativeI18nManagerSpec(context) {
-  override public fun getTypedExportedConstants(): Map<String, Any> {
+  public override fun getTypedExportedConstants(): Map<String, Any> {
     val context = getReactApplicationContext()
     val locale = context.resources.configuration.locales[0]
 

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

@@ -80,7 +80,7 @@ public class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventLis
    *   when there is an error
    */
   @ReactMethod
-  override public fun getSize(uriString: String?, promise: Promise) {
+  public override fun getSize(uriString: String?, promise: Promise) {
     if (uriString.isNullOrEmpty()) {
       promise.reject(ERROR_INVALID_URI, "Cannot get the size of an image for an empty URI")
       return
@@ -91,9 +91,7 @@ public class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventLis
         this.imagePipeline.fetchDecodedImage(request, this.callerContext)
     val dataSubscriber: DataSubscriber<CloseableReference<CloseableImage>> =
         object : BaseDataSubscriber<CloseableReference<CloseableImage>>() {
-          protected override fun onNewResultImpl(
-              dataSource: DataSource<CloseableReference<CloseableImage>>
-          ) {
+          override fun onNewResultImpl(dataSource: DataSource<CloseableReference<CloseableImage>>) {
             if (!dataSource.isFinished) {
               return
             }
@@ -115,9 +113,7 @@ public class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventLis
             }
           }
 
-          protected override fun onFailureImpl(
-              dataSource: DataSource<CloseableReference<CloseableImage>>
-          ) {
+          override fun onFailureImpl(dataSource: DataSource<CloseableReference<CloseableImage>>) {
             promise.reject(ERROR_GET_SIZE_FAILURE, dataSource.failureCause)
           }
         }
@@ -133,7 +129,7 @@ public class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventLis
    *   when there is an error
    */
   @ReactMethod
-  override public fun getSizeWithHeaders(
+  public override fun getSizeWithHeaders(
       uriString: String?,
       headers: ReadableMap?,
       promise: Promise
@@ -151,9 +147,7 @@ public class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventLis
         this.imagePipeline.fetchDecodedImage(request, this.callerContext)
     val dataSubscriber: DataSubscriber<CloseableReference<CloseableImage>> =
         object : BaseDataSubscriber<CloseableReference<CloseableImage>>() {
-          protected override fun onNewResultImpl(
-              dataSource: DataSource<CloseableReference<CloseableImage>>
-          ) {
+          override fun onNewResultImpl(dataSource: DataSource<CloseableReference<CloseableImage>>) {
             if (!dataSource.isFinished) {
               return
             }
@@ -175,9 +169,7 @@ public class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventLis
             }
           }
 
-          protected override fun onFailureImpl(
-              dataSource: DataSource<CloseableReference<CloseableImage>>
-          ) {
+          override fun onFailureImpl(dataSource: DataSource<CloseableReference<CloseableImage>>) {
             promise.reject(ERROR_GET_SIZE_FAILURE, dataSource.failureCause)
           }
         }
@@ -192,7 +184,7 @@ public class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventLis
    * @param promise the promise that is fulfilled when the image is successfully prefetched or
    *   rejected when there is an error
    */
-  override public fun prefetchImage(
+  public override fun prefetchImage(
       uriString: String?,
       requestIdAsDouble: Double,
       promise: Promise
@@ -208,7 +200,7 @@ public class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventLis
         this.imagePipeline.prefetchToDiskCache(request, this.callerContext)
     val prefetchSubscriber =
         object : BaseDataSubscriber<Void?>() {
-          protected override fun onNewResultImpl(dataSource: DataSource<Void?>) {
+          override fun onNewResultImpl(dataSource: DataSource<Void?>) {
             if (!dataSource.isFinished) {
               return
             }
@@ -222,7 +214,7 @@ public class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventLis
             }
           }
 
-          protected override fun onFailureImpl(dataSource: DataSource<Void?>) {
+          override fun onFailureImpl(dataSource: DataSource<Void?>) {
             try {
               removeRequest(requestId)
               promise.reject(ERROR_PREFETCH_FAILURE, dataSource.failureCause)
@@ -235,17 +227,17 @@ public class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventLis
     prefetchSource.subscribe(prefetchSubscriber, CallerThreadExecutor.getInstance())
   }
 
-  override public fun abortRequest(requestId: Double) {
+  public override fun abortRequest(requestId: Double) {
     val request = removeRequest(requestId.toInt())
     request?.close()
   }
 
   @ReactMethod
-  override public fun queryCache(uris: ReadableArray, promise: Promise) {
+  public override fun queryCache(uris: ReadableArray, promise: Promise) {
     // perform cache interrogation in async task as disk cache checks are expensive
     @Suppress("DEPRECATION", "StaticFieldLeak")
     object : GuardedAsyncTask<Void, Void>(getReactApplicationContext()) {
-          protected override fun doInBackgroundGuarded(vararg params: Void) {
+          override fun doInBackgroundGuarded(vararg params: Void) {
             val result: WritableMap = Arguments.createMap()
             val imagePipeline: ImagePipeline = this@ImageLoaderModule.imagePipeline
             for (i in 0 until uris.size()) {

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/{ProgressListener.java → CustomClientBuilder.kt}

@@ -5,8 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.modules.network;
+package com.facebook.react.modules.network
 
-public interface ProgressListener {
-  void onProgress(long bytesWritten, long contentLength, boolean done);
+import okhttp3.OkHttpClient
+
+public fun interface CustomClientBuilder {
+  public fun apply(builder: OkHttpClient.Builder)
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/{HeaderUtil.java → HeaderUtil.kt}

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.modules.network;
+package com.facebook.react.modules.network
 
 /**
  * The class purpose is to weaken too strict OkHttp restriction on http headers. See:
@@ -13,19 +13,21 @@ package com.facebook.react.modules.network;
  * information. It is better to get 401 from the server in this case, rather than non descriptive
  * error as 401 could be handled to invalidate the wrong token in the client code.
  */
-class HeaderUtil {
-
-  public static String stripHeaderName(String name) {
-    StringBuilder builder = new StringBuilder(name.length());
-    boolean modified = false;
-    for (int i = 0, length = name.length(); i < length; i++) {
-      char c = name.charAt(i);
-      if (c > '\u0020' && c < '\u007f') {
-        builder.append(c);
-      } else {
-        modified = true;
+internal class HeaderUtil {
+  companion object {
+    @JvmStatic
+    fun stripHeaderName(name: String): String {
+      val builder = StringBuilder(name.length)
+      var modified = false
+      for (i in 0 until name.length) {
+        val c = name[i]
+        if (c > '\u0020' && c < '\u007f') {
+          builder.append(c)
+        } else {
+          modified = true
+        }
       }
+      return if (modified) builder.toString() else name
     }
-    return modified ? builder.toString() : name;
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.kt

@@ -0,0 +1,18 @@
+/*
+ * 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.network
+
+import okhttp3.Interceptor
+
+/**
+ * Classes implementing this interface return a new [Interceptor] when the [create] method is
+ * called.
+ */
+public fun interface NetworkInterceptorCreator {
+  public fun create(): Interceptor
+}

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.kt

@@ -0,0 +1,14 @@
+/*
+ * 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.network
+
+import okhttp3.OkHttpClient
+
+public fun interface OkHttpClientFactory {
+  public fun createNewNetworkModuleClient(): OkHttpClient
+}

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.kt

@@ -0,0 +1,79 @@
+/*
+ * 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.network
+
+import android.content.Context
+import java.io.File
+import java.util.concurrent.TimeUnit
+import okhttp3.Cache
+import okhttp3.OkHttpClient
+
+/**
+ * Helper class that provides the same OkHttpClient instance that will be used for all networking
+ * requests.
+ */
+public object OkHttpClientProvider {
+  // Centralized OkHttpClient for all networking requests.
+  internal var client: OkHttpClient? = null
+
+  // User-provided OkHttpClient factory
+  internal var factory: OkHttpClientFactory? = null
+
+  @JvmStatic
+  public fun setOkHttpClientFactory(factory: OkHttpClientFactory?) {
+    this.factory = factory
+  }
+
+  @JvmStatic
+  public fun getOkHttpClient(): OkHttpClient {
+    return client ?: createClient().also { client = it }
+  }
+
+  @JvmStatic
+  public fun createClient(): OkHttpClient {
+    return factory?.createNewNetworkModuleClient() ?: createClientBuilder().build()
+  }
+
+  @JvmStatic
+  public fun createClient(context: Context): OkHttpClient {
+    return factory?.createNewNetworkModuleClient() ?: createClientBuilder(context).build()
+  }
+
+  @JvmStatic
+  public fun createClientBuilder(): OkHttpClient.Builder {
+    // No timeouts by default
+    val client: OkHttpClient.Builder =
+        OkHttpClient.Builder()
+            .connectTimeout(0, TimeUnit.MILLISECONDS)
+            .readTimeout(0, TimeUnit.MILLISECONDS)
+            .writeTimeout(0, TimeUnit.MILLISECONDS)
+            .cookieJar(ReactCookieJarContainer())
+
+    return client
+  }
+
+  @JvmStatic
+  public fun createClientBuilder(context: Context): OkHttpClient.Builder {
+    val cacheSize = 10 * 1024 * 1024 // 10 Mo
+    return createClientBuilder(context, cacheSize)
+  }
+
+  @JvmStatic
+  public fun createClientBuilder(context: Context, cacheSize: Int): OkHttpClient.Builder {
+    val client: OkHttpClient.Builder = createClientBuilder()
+
+    if (cacheSize == 0) {
+      return client
+    }
+
+    val cacheDirectory = File(context.cacheDir, "http-cache")
+    val cache = Cache(cacheDirectory, cacheSize.toLong())
+
+    return client.cache(cache)
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/{OkHttpClientFactory.java → ProgressListener.kt}

@@ -5,11 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.modules.network;
+package com.facebook.react.modules.network
 
-import okhttp3.OkHttpClient;
-
-public interface OkHttpClientFactory {
-  OkHttpClient createNewNetworkModuleClient();
+public fun interface ProgressListener {
+  public fun onProgress(bytesWritten: Long, contentLength: Long, done: Boolean)
 }
-;

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.kt

@@ -0,0 +1,80 @@
+/*
+ * 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.
+ */
+
+@file:Suppress("DEPRECATION_ERROR") // Conflicting okio versions
+
+package com.facebook.react.modules.network
+
+import java.io.FilterOutputStream
+import java.io.IOException
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import okio.BufferedSink
+import okio.Okio
+import okio.Sink
+
+internal class ProgressRequestBody(
+    private val requestBody: RequestBody,
+    private val progressListener: ProgressListener
+) : RequestBody() {
+  private var contentLength = 0L
+
+  override fun contentType(): MediaType? {
+    return requestBody.contentType()
+  }
+
+  @Throws(IOException::class)
+  override fun contentLength(): Long {
+    if (contentLength == 0L) {
+      contentLength = requestBody.contentLength()
+    }
+    return contentLength
+  }
+
+  @Throws(IOException::class)
+  override fun writeTo(sink: BufferedSink) {
+    // In 99% of cases, this method is called strictly once.
+    // The only case when it is called more than once is internal okhttp upload re-try.
+    // We need to re-create CountingOutputStream in this case as progress should be re-evaluated.
+    val sinkWrapper = Okio.buffer(outputStreamSink(sink))
+
+    // contentLength changes for input streams, since we're using inputStream.available(),
+    // so get the length before writing to the sink
+    contentLength()
+
+    requestBody.writeTo(sinkWrapper)
+    sinkWrapper.flush()
+  }
+
+  private fun outputStreamSink(sink: BufferedSink): Sink {
+    return Okio.sink(
+        object : FilterOutputStream(sink.outputStream()) {
+          private var count: Long = 0
+
+          @Throws(IOException::class)
+          override fun write(data: ByteArray, offset: Int, byteCount: Int) {
+            super.write(data, offset, byteCount)
+            count += byteCount.toLong()
+            sendProgressUpdate()
+          }
+
+          @Throws(IOException::class)
+          override fun write(data: Int) {
+            super.write(data)
+            count++
+            sendProgressUpdate()
+          }
+
+          @Throws(IOException::class)
+          fun sendProgressUpdate() {
+            val bytesWritten = count
+            val contentLength = contentLength()
+            progressListener.onProgress(bytesWritten, contentLength, bytesWritten == contentLength)
+          }
+        })
+  }
+}