Fix random access read

Author: abnegate

templates/android/library/src/main/java/io/appwrite/Client.kt.twig

@@ -23,6 +23,7 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import java.io.BufferedInputStream
 import java.io.BufferedReader
 import java.io.File
+import java.io.RandomAccessFile
 import java.io.IOException
 import java.net.CookieManager
 import java.net.CookiePolicy
@@ -340,40 +341,32 @@ class Client @JvmOverloads constructor(
             )
         }
 
-        val input = file.inputStream().buffered()
+        val input = RandomAccessFile(file, "r")
         val buffer = ByteArray(CHUNK_SIZE)
         var offset = 0L
         var result: Map<*, *>? = null
 
         if (idParamName?.isNotEmpty() == true && params[idParamName] != "unique()") {
             // Make a request to check if a file already exists
-            try {
-                val current = call(
-                    method = "GET",
-                    path = "$path/$params[idParamName]",
-                    headers = headers,
-                    params = emptyMap(),
-                    responseType = Map::class.java,
-                )
-                val chunksUploaded = current["chunksUploaded"] as Long
-                offset = size.coerceAtMost(chunksUploaded * CHUNK_SIZE)
-            } catch (ex: {{spec.title | caseUcfirst}}Exception) {
-            }
+            val current = call(
+                method = "GET",
+                path = "$path/${params[idParamName]}",
+                headers = headers,
+                params = emptyMap(),
+                responseType = Map::class.java,
+            )
+            val chunksUploaded = current["chunksUploaded"] as Long
+            offset = (chunksUploaded * CHUNK_SIZE).coerceAtMost(size)
         }
 
-        generateSequence {
-            val readBytes = input.read(buffer, offset.toInt(), CHUNK_SIZE)
-            if (readBytes >= 0) {
-                buffer.copyOf(readBytes)
-            } else {
-                input.close()
-                null
-            }
-        }.forEach {
+        while (offset < size) {
+            input.seek(offset)
+            input.read(buffer)
+
             params[paramName] = MultipartBody.Part.createFormData(
                 paramName,
                 file.name,
-                it.toRequestBody()
+                buffer.toRequestBody()
             )
 
             headers["Content-Range"] =
@@ -388,14 +381,16 @@ class Client @JvmOverloads constructor(
             )
 
             offset += CHUNK_SIZE
-            headers["x-{{ spec.title | caseLower }}-id"] = result!!["\$id"].toString()
-            onProgress?.invoke(UploadProgress(
-                id = result!!["\$id"].toString(),
-                progress = offset.coerceAtMost(size).toDouble()/size * 100,
-                sizeUploaded = offset.coerceAtMost(size),
-                chunksTotal = result!!["chunksTotal"].toString().toInt(),
-                chunksUploaded = result!!["chunksUploaded"].toString().toInt(),
-            ))
+            headers["x-appwrite-id"] = result!!["\$id"].toString()
+            onProgress?.invoke(
+                UploadProgress(
+                    id = result!!["\$id"].toString(),
+                    progress = offset.coerceAtMost(size).toDouble() / size * 100,
+                    sizeUploaded = offset.coerceAtMost(size),
+                    chunksTotal = result!!["chunksTotal"].toString().toInt(),
+                    chunksUploaded = result!!["chunksUploaded"].toString().toInt(),
+                )
+            )
         }
 
         return converter(result as Map<String, Any>)