From 61f074ddc1764aaf782842d16f55ecf9e96b9377 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 30 Apr 2026 14:18:15 +0200
Subject: [PATCH] Let our Json parser accept comments and trailing comma.

---
 .../android/libraries/androidutils/json/JsonProvider.kt  | 9 ++++++++-
 .../impl/DefaultSessionWellknownRetrieverTest.kt         | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/json/JsonProvider.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/json/JsonProvider.kt
index 1e25599962..12f2957678 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/json/JsonProvider.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/json/JsonProvider.kt
@@ -23,6 +23,13 @@ fun interface JsonProvider {
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
 class DefaultJsonProvider : JsonProvider {
-    private val json: Json by lazy { Json { ignoreUnknownKeys = true } }
+    private val json: Json by lazy {
+        Json {
+            ignoreUnknownKeys = true
+            allowComments = true
+            allowTrailingComma = true
+        }
+    }
+
     override fun invoke() = json
 }
diff --git a/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetrieverTest.kt b/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetrieverTest.kt
index faad139a36..e8c97c0220 100644
--- a/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetrieverTest.kt
+++ b/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetrieverTest.kt
@@ -80,7 +80,8 @@ class DefaultSessionWellknownRetrieverTest {
                     "registration_helper_url": "a_registration_url",
                     "enforce_element_pro": true,
                     "rageshake_url": "a_rageshake_url",
-                    "other": true
+                    // Note the trailing comma, and the comment!
+                    "other": true,
                 }""".trimIndent().toByteArray()
                 )
             },