From 7f06c321cc29c3094b59d8b4c138abab16f41a86 Mon Sep 17 00:00:00 2001
From: yostyle <y.pintas@gmail.com>
Date: Thu, 17 Aug 2023 09:55:05 +0200
Subject: [PATCH] Update dispatcher

---
 .../android/libraries/featureflag/api/FeatureFlags.kt     | 2 +-
 .../android/libraries/matrix/impl/RustMatrixClient.kt     | 2 +-
 .../RustNotificationSettingsService.kt                    | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
index d881aed257..dbbbc0368f 100644
--- a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
+++ b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
@@ -31,7 +31,7 @@ enum class FeatureFlags(
         title = "Polls",
         description = "Render poll events in the timeline",
         defaultValue = false,
-    )
+    ),
     NotificationSettings(
         key = "feature.notificationsettings",
         title = "Show notification settings",
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
index 39fc07d055..e3f675cc2b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
@@ -106,7 +106,7 @@ class RustMatrixClient constructor(
     private val notificationSettings = client.getNotificationSettings()
 
     private val notificationService = RustNotificationService(sessionId, notificationClient, dispatchers, clock)
-    private val notificationSettingsService = RustNotificationSettingsService(notificationSettings)
+    private val notificationSettingsService = RustNotificationSettingsService(notificationSettings, dispatchers)
 
     private val isLoggingOut = AtomicBoolean(false)
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt
index 009cbd25d9..b15b25c042 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.libraries.matrix.impl.notificationsettings
 
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
@@ -24,13 +25,15 @@ import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.NotificationClient
 import org.matrix.rustcomponents.sdk.NotificationSettings
 import org.matrix.rustcomponents.sdk.NotificationSettingsDelegate
 
 class RustNotificationSettingsService(
-    private val notificationSettings: NotificationSettings
+    private val notificationSettings: NotificationSettings,
+    private val dispatchers: CoroutineDispatchers,
 ) : NotificationSettingsService {
 
     private val _notificationSettingsChangeFlow = MutableSharedFlow<Unit>(extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
@@ -56,10 +59,11 @@ class RustNotificationSettingsService(
             notificationSettings.getDefaultRoomNotificationMode(isEncrypted, membersCount).let(RoomNotificationSettingsMapper::mapMode)
         }
 
-    override suspend fun setRoomNotificationMode(roomId: RoomId, mode: RoomNotificationMode): Result<Unit> =
+    override suspend fun setRoomNotificationMode(roomId: RoomId, mode: RoomNotificationMode): Result<Unit> = withContext(dispatchers.io) {
         runCatching {
             notificationSettings.setRoomNotificationMode(roomId.value, mode.let(RoomNotificationSettingsMapper::mapMode))
         }
+    }
 
     override suspend fun restoreDefaultRoomNotificationMode(roomId: RoomId): Result<Unit> =
         runCatching {