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

Merge pull request #3735 from nextcloud/feature/noid/fixMarkAsReadForFederatedRooms

Browse Source 
fix to mark federated rooms as read
This commit is contained in:
Marcel Hibbe 2024-03-20 13:43:33 +01:00 committed by GitHub
commit 4cf0fd20f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/api/NcApi.java
View File

@ -552,7 +552,7 @@ public interface NcApi {
@POST
Observable<GenericOverall> setChatReadMarker(@Header("Authorization") String authorization,
@Url String url,
@Field("lastReadMessage") int lastReadMessage);
@Nullable @Field("lastReadMessage") Integer lastReadMessage);
// Url is: /api/{apiVersion}/chat/{token}/read
@DELETE

9
app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt
View File

@ -308,6 +308,12 @@ class ConversationsListBottomDialog(
}
private fun markConversationAsRead() {
val messageId = if (conversation.remoteServer.isNullOrEmpty()) {
conversation.lastMessage!!.jsonMessageId
} else {
null
}
ncApi.setChatReadMarker(
credentials,
ApiUtils.getUrlForChatReadMarker(
@ -315,7 +321,7 @@ class ConversationsListBottomDialog(
currentUser.baseUrl!!,
conversation.token!!
),
conversation.lastMessage!!.jsonMessageId
messageId
)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@ -360,6 +366,7 @@ class ConversationsListBottomDialog(
)
}
}
private fun leaveConversation() {
val dataBuilder = Data.Builder()
dataBuilder.putString(KEY_ROOM_TOKEN, conversation.token)