fixes after some wrong merge after merge conflict

Signed-off-by: Marcel Hibbe <[email protected]>
nextcloud · Nov 21, 2024 · 17995ee · 17995ee
1 parent 13c1eb2
commit 17995ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/ChatNetworkDataSource.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/ChatNetworkDataSource.kt
@@ -63,5 +63,5 @@ interface ChatNetworkDataSource {
     fun deleteChatMessage(credentials: String, url: String): Observable<ChatOverallSingleMessage>
     fun createRoom(credentials: String, url: String, map: Map<String, String>): Observable<RoomOverall>
     fun setChatReadMarker(credentials: String, url: String, previousMessageId: Int): Observable<GenericOverall>
-    fun editChatMessage(credentials: String, url: String, text: String): Observable<ChatOverallSingleMessage>
+    suspend fun editChatMessage(credentials: String, url: String, text: String): ChatOverallSingleMessage
 }
diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt
@@ -179,7 +179,6 @@ class RetrofitChatNetwork(private val ncApi: NcApi, private val ncApiCoroutines:
         previousMessageId: Int
     ): Observable<GenericOverall> = ncApi.setChatReadMarker(credentials, url, previousMessageId).map { it }
 
-    override fun editChatMessage(credentials: String, url: String, text: String): Observable<ChatOverallSingleMessage> {
-        return ncApi.editChatMessage(credentials, url, text).map { it }
-    }
+    override suspend fun editChatMessage(credentials: String, url: String, text: String): ChatOverallSingleMessage =
+        ncApiCoroutines.editChatMessage(credentials, url, text)
 }