From 18b38fe21ece50b10a5941405e60ed50df98cf37 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 20 Dec 2021 11:52:01 +0000
Subject: [PATCH] making the file upload file creation all happen on the IO
 dispatcher

---
 .../internal/session/content/FileUploader.kt  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
index 1b0ccbb489..b988f2253c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
@@ -109,18 +109,23 @@ internal class FileUploader @Inject constructor(
                               filename: String?,
                               mimeType: String?,
                               progressListener: ProgressRequestBody.Listener? = null): ContentUploadResponse {
-        val inputStream = withContext(Dispatchers.IO) {
-            context.contentResolver.openInputStream(uri)
-        } ?: throw FileNotFoundException()
-        val workingFile = temporaryFileCreator.create()
-        workingFile.outputStream().use {
-            inputStream.copyTo(it)
-        }
+        val workingFile = context.copyUriToTempFile(uri)
         return uploadFile(workingFile, filename, mimeType, progressListener).also {
             tryOrNull { workingFile.delete() }
         }
     }
 
+    private suspend fun Context.copyUriToTempFile(uri: Uri): File {
+        return withContext(Dispatchers.IO) {
+            val inputStream = contentResolver.openInputStream(uri) ?: throw FileNotFoundException()
+            val workingFile = temporaryFileCreator.create()
+            workingFile.outputStream().use {
+                inputStream.copyTo(it)
+            }
+            workingFile
+        }
+    }
+
     private suspend fun upload(uploadBody: RequestBody,
                                filename: String?,
                                progressListener: ProgressRequestBody.Listener?): ContentUploadResponse {