ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-04 10:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2 mapCatchingExceptions into a single one.

Browse Source
This commit is contained in:
Benoit Marty
2025-08-11 10:55:42 +02:00
parent d277a604bb
commit bac59f6caa
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetriever.kt
+8 -4
View File
@@ -29,8 +29,10 @@ class DefaultSessionWellknownRetriever @Inject constructor(
val url = "https://$domain/.well-known/matrix/client" val url = "https://$domain/.well-known/matrix/client"
return matrixClient return matrixClient
.getUrl(url) .getUrl(url)
.mapCatchingExceptions { String(it) } .mapCatchingExceptions {
.mapCatchingExceptions { parser.decodeFromString(InternalWellKnown.serializer(), it) } val data = String(it)
parser.decodeFromString(InternalWellKnown.serializer(), data)
}
.onFailure { Timber.e(it, "Failed to retrieve .well-known from $domain") } .onFailure { Timber.e(it, "Failed to retrieve .well-known from $domain") }
.map { it.map() } .map { it.map() }
.getOrNull() .getOrNull()
@@ -40,8 +42,10 @@ class DefaultSessionWellknownRetriever @Inject constructor(
val url = "https://$domain/.well-known/element/element.json" val url = "https://$domain/.well-known/element/element.json"
return matrixClient return matrixClient
.getUrl(url) .getUrl(url)
.mapCatchingExceptions { String(it) } .mapCatchingExceptions {
.mapCatchingExceptions { parser.decodeFromString(InternalElementWellKnown.serializer(), it) } val data = String(it)
parser.decodeFromString(InternalElementWellKnown.serializer(), data)
}
.onFailure { Timber.e(it, "Failed to retrieve Element .well-known from $domain") } .onFailure { Timber.e(it, "Failed to retrieve Element .well-known from $domain") }
.map { it.map() } .map { it.map() }
.getOrNull() .getOrNull()