Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve API of interface WellknownRetriever to be able to distinguish between 404 and other errors.

Browse source
This commit is contained in:
Benoit Marty 2025-10-22 15:28:31 +02:00
parent b45fb2128b
commit 5b5c007cd2
2 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
View file

@ -286,7 +286,7 @@ class RustMatrixClient(
override suspend fun getUrl(url: String): Result<ByteArray> = withContext(sessionDispatcher) { override suspend fun getUrl(url: String): Result<ByteArray> = withContext(sessionDispatcher) {
runCatchingExceptions { runCatchingExceptions {
innerClient.getUrl(url) innerClient.getUrl(url)
} }.mapFailure { it.mapClientException() }
} }
override suspend fun getRoom(roomId: RoomId): BaseRoom? = withContext(sessionDispatcher) { override suspend fun getRoom(roomId: RoomId): BaseRoom? = withContext(sessionDispatcher) {

42
libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetriever.kt
View file

@ -13,6 +13,7 @@ import io.element.android.libraries.androidutils.json.JsonProvider
import io.element.android.libraries.core.extensions.mapCatchingExceptions import io.element.android.libraries.core.extensions.mapCatchingExceptions
import io.element.android.libraries.di.SessionScope import io.element.android.libraries.di.SessionScope
import io.element.android.libraries.matrix.api.MatrixClient import io.element.android.libraries.matrix.api.MatrixClient
import io.element.android.libraries.matrix.api.exception.ClientException
import io.element.android.libraries.wellknown.api.ElementWellKnown import io.element.android.libraries.wellknown.api.ElementWellKnown
import io.element.android.libraries.wellknown.api.SessionWellknownRetriever import io.element.android.libraries.wellknown.api.SessionWellknownRetriever
import io.element.android.libraries.wellknown.api.WellKnown import io.element.android.libraries.wellknown.api.WellKnown
@ -33,18 +34,9 @@ class DefaultSessionWellknownRetriever(
.getUrl(url) .getUrl(url)
.mapCatchingExceptions { .mapCatchingExceptions {
val data = String(it) val data = String(it)
json().decodeFromString(InternalWellKnown.serializer(), data) json().decodeFromString<InternalWellKnown>(data).map()
} }
.onFailure { Timber.e(it, "Failed to retrieve .well-known from $domain") } .toWellknownRetrieverResult()
.map { it.map() }
.fold(
onSuccess = {
WellknownRetrieverResult.Success(it)
},
onFailure = {
WellknownRetrieverResult.Error(it as Exception)
}
)
} }
override suspend fun getElementWellKnown(): WellknownRetrieverResult<ElementWellKnown> { override suspend fun getElementWellKnown(): WellknownRetrieverResult<ElementWellKnown> {
@ -53,17 +45,23 @@ class DefaultSessionWellknownRetriever(
.getUrl(url) .getUrl(url)
.mapCatchingExceptions { .mapCatchingExceptions {
val data = String(it) val data = String(it)
json().decodeFromString(InternalElementWellKnown.serializer(), data) json().decodeFromString<InternalElementWellKnown>(data).map()
} }
.onFailure { Timber.e(it, "Failed to retrieve Element .well-known from $domain") } .toWellknownRetrieverResult()
.map { it.map() }
.fold(
onSuccess = {
WellknownRetrieverResult.Success(it)
},
onFailure = {
WellknownRetrieverResult.Error(it as Exception)
}
)
} }
private fun <T> Result<T>.toWellknownRetrieverResult(): WellknownRetrieverResult<T> = fold(
onSuccess = {
WellknownRetrieverResult.Success(it)
},
onFailure = {
Timber.e(it, "Failed to retrieve Element .well-known from $domain")
// This check on message value is not ideal but this is what we got from the SDK.
if ((it as? ClientException.Generic)?.message?.contains("404") == true) {
WellknownRetrieverResult.NotFound
} else {
WellknownRetrieverResult.Error(it as Exception)
}
}
)
} }