filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support stickers in threads

This commit is contained in:
ariskotsomitopoulos 2021-12-10 20:15:39 +02:00
parent 57ef0b59ab
commit 5c015a7444
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
View File

@ -75,6 +75,7 @@ import org.matrix.android.sdk.api.session.Session
import org.matrix.android.sdk.api.session.crypto.MXCryptoError import org.matrix.android.sdk.api.session.crypto.MXCryptoError
import org.matrix.android.sdk.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.EventType
import org.matrix.android.sdk.api.session.events.model.LocalEcho import org.matrix.android.sdk.api.session.events.model.LocalEcho
import org.matrix.android.sdk.api.session.events.model.RelationType
import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
import org.matrix.android.sdk.api.session.events.model.isTextMessage import org.matrix.android.sdk.api.session.events.model.isTextMessage
import org.matrix.android.sdk.api.session.events.model.toContent import org.matrix.android.sdk.api.session.events.model.toContent
@ -87,6 +88,7 @@ import org.matrix.android.sdk.api.session.room.model.Membership
import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
import org.matrix.android.sdk.api.session.room.model.RoomSummary import org.matrix.android.sdk.api.session.room.model.RoomSummary
import org.matrix.android.sdk.api.session.room.model.message.getFileUrl import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
import org.matrix.android.sdk.api.session.room.model.tombstone.RoomTombstoneContent import org.matrix.android.sdk.api.session.room.model.tombstone.RoomTombstoneContent
import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
import org.matrix.android.sdk.api.session.room.read.ReadService import org.matrix.android.sdk.api.session.room.read.ReadService
@ -193,8 +195,6 @@ class RoomDetailViewModel @AssistedInject constructor(
observeLocalThreadNotifications() observeLocalThreadNotifications()
} }
private fun observeDataStore() { private fun observeDataStore() {
viewModelScope.launch { viewModelScope.launch {
vectorDataStore.pushCounterFlow.collect { nbOfPush -> vectorDataStore.pushCounterFlow.collect { nbOfPush ->
@ -287,14 +287,14 @@ class RoomDetailViewModel @AssistedInject constructor(
/** /**
* Observe local unread threads * Observe local unread threads
*/ */
private fun observeLocalThreadNotifications(){ private fun observeLocalThreadNotifications() {
room.flow() room.flow()
.liveLocalUnreadThreadList() .liveLocalUnreadThreadList()
.execute { .execute {
copy(numberOfLocalUnreadThreads = it.invoke()?.size ?: 0) copy(numberOfLocalUnreadThreads = it.invoke()?.size ?: 0)
} }
} }
fun getOtherUserIds() = room.roomSummary()?.otherMemberIds fun getOtherUserIds() = room.roomSummary()?.otherMemberIds
fun getRoomSummary() = room.roomSummary() fun getRoomSummary() = room.roomSummary()
@ -448,7 +448,10 @@ class RoomDetailViewModel @AssistedInject constructor(
} }
private fun handleSendSticker(action: RoomDetailAction.SendSticker) { private fun handleSendSticker(action: RoomDetailAction.SendSticker) {
room.sendEvent(EventType.STICKER, action.stickerContent.toContent()) val content = initialState.rootThreadEventId?.let {
action.stickerContent.copy(relatesTo = RelationDefaultContent(RelationType.THREAD, it))
} ?: action.stickerContent
room.sendEvent(EventType.STICKER, content.toContent())
} }
private fun handleStartCall(action: RoomDetailAction.StartCall) { private fun handleStartCall(action: RoomDetailAction.StartCall) {
@ -1131,13 +1134,14 @@ class RoomDetailViewModel @AssistedInject constructor(
* Mark the thread as read, while the user navigated within the thread * Mark the thread as read, while the user navigated within the thread
* This is a local implementation has nothing to do with APIs * This is a local implementation has nothing to do with APIs
*/ */
private fun markThreadTimelineAsReadLocal(){ private fun markThreadTimelineAsReadLocal() {
initialState.rootThreadEventId?.let{ initialState.rootThreadEventId?.let {
session.coroutineScope.launch { session.coroutineScope.launch {
room.markThreadAsRead(it) room.markThreadAsRead(it)
} }
} }
} }
override fun onTimelineUpdated(snapshot: List<TimelineEvent>) { override fun onTimelineUpdated(snapshot: List<TimelineEvent>) {
timelineEvents.tryEmit(snapshot) timelineEvents.tryEmit(snapshot)