temporary fix on Android

Author: grabbou

packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridInputStream.kt

@@ -2,35 +2,29 @@ package com.margelo.nitro.fastio
 
 import com.margelo.nitro.core.ArrayBuffer
 import com.margelo.nitro.core.Promise
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import java.io.InputStream
 
 class HybridInputStream(val stream: InputStream) : HybridInputStreamSpec() {
     override fun read(): Promise<ArrayBuffer> {
-        return Promise.async {
-            withContext(Dispatchers.IO) {
-                val bytes = ByteArray(HybridStreamFactory.BUFFER_SIZE)
-                val bytesRead = stream.read(bytes, 0, bytes.size)
-
-                when {
-                    bytesRead == -1 -> {
-                        val emptyBuffer = ArrayBuffer.allocate(0)
-                        emptyBuffer
-                    }
-
-                    bytesRead > 0 -> {
-                        val arrayBuffer = ArrayBuffer.allocate(bytesRead)
-
-                        val destBuffer = arrayBuffer.getBuffer(false)
-                        destBuffer.put(bytes, 0, bytesRead)
-
-                        arrayBuffer
-                    }
-
-                    else -> {
-                        throw Error("Unexpected error reading stream")
-                    }
+        return Promise.async(CoroutineScope(Dispatchers.IO)) {
+            val bytes = ByteArray(HybridStreamFactory.BUFFER_SIZE)
+            val bytesRead = stream.read(bytes, 0, bytes.size)
+
+            when {
+                bytesRead == -1 -> {
+                    val emptyBuffer = ArrayBuffer.allocate(0)
+                    emptyBuffer
+                }
+                bytesRead > 0 -> {
+                    val arrayBuffer = ArrayBuffer.allocate(bytesRead)
+                    val destBuffer = arrayBuffer.getBuffer(false)
+                    destBuffer.put(bytes, 0, bytesRead)
+                    arrayBuffer
+                }
+                else -> {
+                    throw Error("Unexpected error reading stream")
                 }
             }
         }

packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridNetwork.kt

@@ -1,37 +1,34 @@
 package com.margelo.nitro.fastio
 
 import com.margelo.nitro.core.Promise
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import java.net.HttpURLConnection
 import java.net.URL
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 
 class HybridNetwork : HybridNetworkSpec() {
     override fun request(opts: RequestOptions): Promise<Unit> {
-        return Promise.async {
-            withContext(Dispatchers.IO) {
-                val connection = URL(opts.url).openConnection() as HttpURLConnection
-
-                connection.apply {
-                    requestMethod = opts.method.name.uppercase()
-                    doInput = true
-                    doOutput = opts.body != null
+        Promise.async(CoroutineScope(Dispatchers.IO)) {
+            val connection = URL(opts.url).openConnection() as HttpURLConnection
+            connection.apply {
+                requestMethod = opts.method.name.uppercase()
+                doInput = true
+                doOutput = opts.body != null
 
-//                    opts.body?.let { hybridStream ->
-//                        (hybridStream as HybridInputStream).stream.use { input ->
-//                            outputStream.buffered().use { output ->
-//                                input.copyTo(output, HybridStreamFactory.BUFFER_SIZE)
-//                            }
-//                        }
-//                    }
-
-                    val code = responseCode
-                    if (code !in 200..299) {
-                        throw Error("HTTP Error: $code")
+                opts.body?.let { hybridStream ->
+                    (hybridStream as HybridInputStream).stream.use { input ->
+                        outputStream.buffered().use { output ->
+                            input.copyTo(output, HybridStreamFactory.BUFFER_SIZE)
+                        }
                     }
                 }
+
+                if (responseCode !in 200..299) {
+                    throw Error("HTTP Error: $responseCode")
+                }
             }
         }
+        return Promise.resolved(Unit)
     }
 
     override val memorySize: Long

packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridOutputStream.kt

@@ -2,8 +2,6 @@ package com.margelo.nitro.fastio
 
 import com.margelo.nitro.core.ArrayBuffer
 import com.margelo.nitro.core.Promise
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import java.io.OutputStream
 
 class HybridOutputStream(private val stream: OutputStream) : HybridOutputStreamSpec() {
@@ -13,9 +11,7 @@ class HybridOutputStream(private val stream: OutputStream) : HybridOutputStreamS
         byteBuffer.get(bytes)
 
         return Promise.async {
-            withContext(Dispatchers.IO) {
-                stream.write(bytes)
-            }
+            stream.write(bytes)
         }
     }