mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-12-18 22:52:04 +03:00
Code Issues Projects Releases Packages 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 2e591db2e9
commit de405d57c3
No known key found for this signature in database
GPG key ID: C793F8B59F43CE7B
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/chat/data/network/ChatNetworkDataSource.kt
View file

@ -63,5 +63,5 @@ interface ChatNetworkDataSource {
fun deleteChatMessage(credentials: String, url: String): Observable<ChatOverallSingleMessage> fun deleteChatMessage(credentials: String, url: String): Observable<ChatOverallSingleMessage>
fun createRoom(credentials: String, url: String, map: Map<String, String>): Observable<RoomOverall> fun createRoom(credentials: String, url: String, map: Map<String, String>): Observable<RoomOverall>
fun setChatReadMarker(credentials: String, url: String, previousMessageId: Int): Observable<GenericOverall> 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
} }

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

@ -179,7 +179,6 @@ class RetrofitChatNetwork(private val ncApi: NcApi, private val ncApiCoroutines:
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)
}
} }