From 40b9f031325cac0a7474a3706341318e62d48dc4 Mon Sep 17 00:00:00 2001
From: aqulu <dev@aqu.lu>
Date: Tue, 8 Dec 2020 22:11:35 +0900
Subject: [PATCH] Remove explicit coroutine context changes

Signed-off-by: aqulu <dev@aqu.lu>
---
 .../session/room/state/DefaultStateService.kt | 45 ++++++++-----------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
index f71b8868ed..78663e8ce2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
@@ -20,7 +20,6 @@ import android.net.Uri
 import androidx.lifecycle.LiveData
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -36,12 +35,10 @@ import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.session.content.FileUploader
 import org.matrix.android.sdk.internal.session.room.alias.AddRoomAliasTask
-import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 
 internal class DefaultStateService @AssistedInject constructor(@Assisted private val roomId: String,
                                                                private val stateEventDataSource: StateEventDataSource,
                                                                private val sendStateTask: SendStateTask,
-                                                               private val coroutineDispatchers: MatrixCoroutineDispatchers,
                                                                private val fileUploader: FileUploader,
                                                                private val addRoomAliasTask: AddRoomAliasTask
 ) : StateService {
@@ -123,33 +120,29 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
     }
 
     override suspend fun updateJoinRule(joinRules: RoomJoinRules?, guestAccess: GuestAccess?) {
-        withContext(coroutineDispatchers.main) {
-            if (joinRules != null) {
-                sendStateEvent(
-                        eventType = EventType.STATE_ROOM_JOIN_RULES,
-                        body = RoomJoinRulesContent(joinRules).toContent(),
-                        stateKey = null
-                )
-            }
-            if (guestAccess != null) {
-                sendStateEvent(
-                        eventType = EventType.STATE_ROOM_GUEST_ACCESS,
-                        body = RoomGuestAccessContent(guestAccess).toContent(),
-                        stateKey = null
-                )
-            }
+        if (joinRules != null) {
+            sendStateEvent(
+                    eventType = EventType.STATE_ROOM_JOIN_RULES,
+                    body = RoomJoinRulesContent(joinRules).toContent(),
+                    stateKey = null
+            )
+        }
+        if (guestAccess != null) {
+            sendStateEvent(
+                    eventType = EventType.STATE_ROOM_GUEST_ACCESS,
+                    body = RoomGuestAccessContent(guestAccess).toContent(),
+                    stateKey = null
+            )
         }
     }
 
     override suspend fun updateAvatar(avatarUri: Uri, fileName: String) {
-        withContext(coroutineDispatchers.main) {
-            val response = fileUploader.uploadFromUri(avatarUri, fileName, "image/jpeg")
-            sendStateEvent(
-                    eventType = EventType.STATE_ROOM_AVATAR,
-                    body = mapOf("url" to response.contentUri),
-                    stateKey = null
-            )
-        }
+        val response = fileUploader.uploadFromUri(avatarUri, fileName, "image/jpeg")
+        sendStateEvent(
+                eventType = EventType.STATE_ROOM_AVATAR,
+                body = mapOf("url" to response.contentUri),
+                stateKey = null
+        )
     }
 
     override suspend fun deleteAvatar() {