From 0a318f618b2e466e0af801e31ad3796bcc48e5e8 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Fri, 13 Nov 2020 18:20:44 +0000
Subject: [PATCH] Convert RawService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
.../matrix/android/sdk/api/raw/RawService.kt | 11 ++-----
.../sdk/internal/raw/DefaultRawService.kt | 29 ++++---------------
.../raw/wellknown/ElementWellKnownExt.kt | 3 +-
3 files changed, 10 insertions(+), 33 deletions(-)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt
index 4e24a17047..19549a338e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt
@@ -16,9 +16,6 @@
package org.matrix.android.sdk.api.raw
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.util.Cancelable
-
/**
* Useful methods to fetch raw data from the server. The access token will not be used to fetched the data
*/
@@ -26,17 +23,15 @@ interface RawService {
/**
* Get a URL, either from cache or from the remote server, depending on the cache strategy
*/
- fun getUrl(url: String,
- rawCacheStrategy: RawCacheStrategy,
- matrixCallback: MatrixCallback<String>): Cancelable
+ suspend fun getUrl(url: String, rawCacheStrategy: RawCacheStrategy): String
/**
* Specific case for the well-known file. Cache validity is 8 hours
*/
- fun getWellknown(userId: String, matrixCallback: MatrixCallback<String>): Cancelable
+ suspend fun getWellknown(userId: String): String
/**
* Clear all the cache data
*/
- fun clearCache(matrixCallback: MatrixCallback<Unit>): Cancelable
+ suspend fun clearCache()
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt
index be01366efa..5107ba5b50 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt
@@ -16,45 +16,28 @@
package org.matrix.android.sdk.internal.raw
-import org.matrix.android.sdk.api.MatrixCallback
import org.matrix.android.sdk.api.raw.RawCacheStrategy
import org.matrix.android.sdk.api.raw.RawService
-import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
import java.util.concurrent.TimeUnit
import javax.inject.Inject
internal class DefaultRawService @Inject constructor(
- private val taskExecutor: TaskExecutor,
private val getUrlTask: GetUrlTask,
private val cleanRawCacheTask: CleanRawCacheTask
) : RawService {
- override fun getUrl(url: String,
- rawCacheStrategy: RawCacheStrategy,
- matrixCallback: MatrixCallback<String>): Cancelable {
- return getUrlTask
- .configureWith(GetUrlTask.Params(url, rawCacheStrategy)) {
- callback = matrixCallback
- }
- .executeBy(taskExecutor)
+ override suspend fun getUrl(url: String, rawCacheStrategy: RawCacheStrategy): String {
+ return getUrlTask.execute(GetUrlTask.Params(url, rawCacheStrategy))
}
- override fun getWellknown(userId: String,
- matrixCallback: MatrixCallback<String>): Cancelable {
+ override suspend fun getWellknown(userId: String): String {
val homeServerDomain = userId.substringAfter(":")
return getUrl(
"https://$homeServerDomain/.well-known/matrix/client",
- RawCacheStrategy.TtlCache(TimeUnit.HOURS.toMillis(8), false),
- matrixCallback
+ RawCacheStrategy.TtlCache(TimeUnit.HOURS.toMillis(8), false)
)
}
- override fun clearCache(matrixCallback: MatrixCallback<Unit>): Cancelable {
- return cleanRawCacheTask
- .configureWith(Unit) {
- callback = matrixCallback
- }
- .executeBy(taskExecutor)
+ override suspend fun clearCache() {
+ return cleanRawCacheTask.execute(Unit)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt
index 119be66f94..c1118e40cb 100644
--- a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt
+++ b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt
@@ -18,10 +18,9 @@ package im.vector.app.features.raw.wellknown
import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.raw.RawService
-import org.matrix.android.sdk.internal.util.awaitCallback
suspend fun RawService.getElementWellknown(userId: String): ElementWellKnown? {
- return tryOrNull { awaitCallback<String> { getWellknown(userId, it) } }
+ return tryOrNull { getWellknown(userId) }
?.let { ElementWellKnownMapper.from(it) }
}