Merge remote-tracking branch 'origin/develop' into feature/bma/assetReader

2025-10-16 20:34:38 +02:00
parent 535211631d d632625684
commit 0656b5b2c4
103 changed files with 475 additions and 281 deletions
--- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
@@ -35,6 +35,7 @@ import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.plus
+import kotlinx.serialization.json.Json
 import java.io.File

@BindingContainer
@@ -120,4 +121,10 @@ object AppModule {
    fun providesEmojibaseProvider(@ApplicationContext context: Context): EmojibaseProvider {
        return DefaultEmojibaseProvider(context)
    }
+
+    @Provides
+    @SingleIn(AppScope::class)
+    fun providesJson(): Json = Json {
+        ignoreUnknownKeys = true
+    }
 }