mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-28 05:59:05 +03:00
Code Issues Projects Releases Packages Wiki Activity

Still show threads as replies when threads are disabled

Browse source 
Change-Id: Id08fd8be12bb7bfc589d21989ae96f9457961d15
This commit is contained in:
SpiritCroc 2022-12-17 15:17:43 +01:00
parent 7a83a44077
commit 1c335194cf
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
View file

@ -191,6 +191,7 @@ class TimelineViewModel @AssistedInject constructor(
// Same lifecycle than the ViewModel (survive to screen rotation)
val previewUrlRetriever = PreviewUrlRetriever(session, viewModelScope, buildMeta)
val replyPreviewRetriever = ReplyPreviewRetriever(
vectorPreferences,
initialState.roomId,
session,
viewModelScope,

6
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reply/ReplyPreviewRetriever.kt
View file

@ -28,6 +28,7 @@ import im.vector.app.features.html.PillsPostProcessor
import im.vector.app.features.html.SpanUtils
import im.vector.app.features.html.VectorHtmlCompressor
import im.vector.app.features.media.ImageContentRenderer
import im.vector.app.features.settings.VectorPreferences
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@ -47,6 +48,7 @@ import timber.log.Timber
import java.util.UUID
class ReplyPreviewRetriever(
vectorPreferences: VectorPreferences,
private val roomId: String,
private val session: Session,
private val coroutineScope: CoroutineScope,
@ -95,6 +97,8 @@ class ReplyPreviewRetriever(
// eventToRetrieveId-specific locking
private val retrieveEventLocks = mutableMapOf<String, Any>()
private val threadsEnabled = vectorPreferences.areThreadMessagesEnabled()
fun invalidateEventsFromSnapshot(snapshot: List<TimelineEvent>) {
val snapshotEvents = snapshot.associateBy { it.eventId }
synchronized(data) {
@ -125,7 +129,7 @@ class ReplyPreviewRetriever(
val current = data[eventId]
val relationContent = event.root.getRelationContent()
val repliedToEventId = relationContent?.inReplyTo?.eventId?.takeIf { relationContent.isFallingBack != true }
val repliedToEventId = relationContent?.inReplyTo?.eventId?.takeIf { relationContent.isFallingBack != true || !threadsEnabled }
if (current == null || repliedToEventId != current.latestRepliedToEventId) {
// We have not rendered this yet, or the replied-to event has updated
if (repliedToEventId?.isNotEmpty().orFalse()) {