From a3a2c0a9a8f1c388e58f03409fb23665f33d2267 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Fri, 13 Nov 2020 19:10:08 +0000
Subject: [PATCH] Convert UploadsService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../sdk/api/session/room/uploads/UploadsService.kt  |  7 +------
 .../session/room/uploads/DefaultUploadsService.kt   | 13 ++-----------
 .../roomprofile/uploads/RoomUploadsViewModel.kt     |  5 +----
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt
index c3cc1eb9ee..e2462d007d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt
@@ -16,9 +16,6 @@
 
 package org.matrix.android.sdk.api.session.room.uploads
 
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.util.Cancelable
-
 /**
  * This interface defines methods to get event with uploads (= attachments) sent to a room. It's implemented at the room level.
  */
@@ -29,7 +26,5 @@ interface UploadsService {
      * @param numberOfEvents the expected number of events to retrieve. The result can contain less events.
      * @param since token to get next page, or null to get the first page
      */
-    fun getUploads(numberOfEvents: Int,
-                   since: String?,
-                   callback: MatrixCallback<GetUploadsResult>): Cancelable
+    suspend fun getUploads(numberOfEvents: Int, since: String?): GetUploadsResult
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt
index 824bd23c01..895f1cf50d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt
@@ -18,17 +18,12 @@ package org.matrix.android.sdk.internal.session.room.uploads
 
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.room.uploads.GetUploadsResult
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
-import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
 
 internal class DefaultUploadsService @AssistedInject constructor(
         @Assisted private val roomId: String,
-        private val taskExecutor: TaskExecutor,
         private val getUploadsTask: GetUploadsTask,
         private val cryptoService: CryptoService
 ) : UploadsService {
@@ -38,11 +33,7 @@ internal class DefaultUploadsService @AssistedInject constructor(
         fun create(roomId: String): UploadsService
     }
 
-    override fun getUploads(numberOfEvents: Int, since: String?, callback: MatrixCallback<GetUploadsResult>): Cancelable {
-        return getUploadsTask
-                .configureWith(GetUploadsTask.Params(roomId, cryptoService.isRoomEncrypted(roomId), numberOfEvents, since)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun getUploads(numberOfEvents: Int, since: String?): GetUploadsResult {
+        return getUploadsTask.execute(GetUploadsTask.Params(roomId, cryptoService.isRoomEncrypted(roomId), numberOfEvents, since))
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
index 76b1a9e0c3..763eed5474 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
@@ -33,7 +33,6 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
-import org.matrix.android.sdk.api.session.room.uploads.GetUploadsResult
 import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
@@ -90,9 +89,7 @@ class RoomUploadsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                val result = awaitCallback<GetUploadsResult> {
-                    room.getUploads(20, token, it)
-                }
+                val result = room.getUploads(20, token)
 
                 token = result.nextToken