gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes after some wrong merge after merge conflict

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2024-11-21 22:39:57 +01:00
parent 3597cf2085
commit c33bd997a4
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt
View File

@ -182,9 +182,8 @@ class RetrofitChatNetwork(
previousMessageId: Int previousMessageId: Int
): Observable<GenericOverall> = ncApi.setChatReadMarker(credentials, url, previousMessageId).map { it } ): Observable<GenericOverall> = ncApi.setChatReadMarker(credentials, url, previousMessageId).map { it }
override fun editChatMessage(credentials: String, url: String, text: String): Observable<ChatOverallSingleMessage> { override suspend fun editChatMessage(credentials: String, url: String, text: String): ChatOverallSingleMessage =
return ncApi.editChatMessage(credentials, url, text).map { it } ncApiCoroutines.editChatMessage(credentials, url, text)
}
override suspend fun getOutOfOfficeStatusForUser( override suspend fun getOutOfOfficeStatusForUser(
credentials: String, credentials: String,