From bac59f6caa88acc2a3d02cb61f18312916360919 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 11 Aug 2025 10:55:42 +0200
Subject: [PATCH] Merge 2 mapCatchingExceptions into a single one.

---
 .../impl/DefaultSessionWellknownRetriever.kt         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetriever.kt b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetriever.kt
index b19ab5cac3..0c948af1d9 100644
--- a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetriever.kt
+++ b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetriever.kt
@@ -29,8 +29,10 @@ class DefaultSessionWellknownRetriever @Inject constructor(
         val url = "https://$domain/.well-known/matrix/client"
         return matrixClient
             .getUrl(url)
-            .mapCatchingExceptions { String(it) }
-            .mapCatchingExceptions { parser.decodeFromString(InternalWellKnown.serializer(), it) }
+            .mapCatchingExceptions {
+                val data = String(it)
+                parser.decodeFromString(InternalWellKnown.serializer(), data)
+            }
             .onFailure { Timber.e(it, "Failed to retrieve .well-known from $domain") }
             .map { it.map() }
             .getOrNull()
@@ -40,8 +42,10 @@ class DefaultSessionWellknownRetriever @Inject constructor(
         val url = "https://$domain/.well-known/element/element.json"
         return matrixClient
             .getUrl(url)
-            .mapCatchingExceptions { String(it) }
-            .mapCatchingExceptions { parser.decodeFromString(InternalElementWellKnown.serializer(), it) }
+            .mapCatchingExceptions {
+                val data = String(it)
+                parser.decodeFromString(InternalElementWellKnown.serializer(), data)
+            }
             .onFailure { Timber.e(it, "Failed to retrieve Element .well-known from $domain") }
             .map { it.map() }
             .getOrNull()