rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5594 from vector-im/feature/aris/thread_root_permalink_navigation

Browse Source 
Improve permalink on thread root message
This commit is contained in:
Aris Kotsomitopoulos 2022-04-05 16:39:46 +03:00 committed by GitHub
commit d484ba07cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5567.misc Normal file
View File

@ -0,0 +1 @@
Permalinks to root thread messages will now navigate you within the thread timeline

9
vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
View File

@ -38,6 +38,7 @@ import org.matrix.android.sdk.api.session.permalinks.PermalinkService
import org.matrix.android.sdk.api.session.room.model.Membership import org.matrix.android.sdk.api.session.room.model.Membership
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.RoomType import org.matrix.android.sdk.api.session.room.model.RoomType
import org.matrix.android.sdk.api.session.room.timeline.isRootThread
import javax.inject.Inject import javax.inject.Inject
class PermalinkHandler @Inject constructor(private val activeSessionHolder: ActiveSessionHolder, class PermalinkHandler @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
@ -89,7 +90,13 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
val rootThreadEventId = permalinkData.eventId?.let { eventId -> val rootThreadEventId = permalinkData.eventId?.let { eventId ->
val room = roomId?.let { session?.getRoom(it) } val room = roomId?.let { session?.getRoom(it) }
room?.getTimelineEvent(eventId)?.root?.getRootThreadEventId()
val rootThreadEventId = room?.getTimelineEvent(eventId)?.root?.getRootThreadEventId()
rootThreadEventId ?: if (room?.getTimelineEvent(eventId)?.isRootThread() == true) {
eventId
} else {
null
}
} }
openRoom( openRoom(
navigationInterceptor, navigationInterceptor,