jarno/element-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5129 from vector-im/feature/aris/threads_fallback_permalink

Browse source 
Fix fallback permalink when threads are disabled
This commit is contained in:
Benoit Marty 2022-02-02 16:06:34 +01:00 committed by GitHub
commit c479073583
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/5128.bugfix Normal file
View file

@ -0,0 +1 @@
Fix fallback permalink when threads are disabled

4
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
View file

@ -88,6 +88,7 @@ import im.vector.app.core.platform.VectorBaseFragment
import im.vector.app.core.platform.lifecycleAwareLazy import im.vector.app.core.platform.lifecycleAwareLazy
import im.vector.app.core.platform.showOptimizedSnackbar import im.vector.app.core.platform.showOptimizedSnackbar
import im.vector.app.core.resources.ColorProvider import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.resources.UserPreferencesProvider
import im.vector.app.core.time.Clock import im.vector.app.core.time.Clock
import im.vector.app.core.ui.views.CurrentCallsView import im.vector.app.core.ui.views.CurrentCallsView
import im.vector.app.core.ui.views.CurrentCallsViewPresenter import im.vector.app.core.ui.views.CurrentCallsViewPresenter
@ -253,6 +254,7 @@ class TimelineFragment @Inject constructor(
private val vectorPreferences: VectorPreferences, private val vectorPreferences: VectorPreferences,
private val colorProvider: ColorProvider, private val colorProvider: ColorProvider,
private val dimensionConverter: DimensionConverter, private val dimensionConverter: DimensionConverter,
private val userPreferencesProvider: UserPreferencesProvider,
private val notificationUtils: NotificationUtils, private val notificationUtils: NotificationUtils,
private val matrixItemColorProvider: MatrixItemColorProvider, private val matrixItemColorProvider: MatrixItemColorProvider,
private val imageContentRenderer: ImageContentRenderer, private val imageContentRenderer: ImageContentRenderer,
@ -1804,7 +1806,7 @@ class TimelineFragment @Inject constructor(
if (roomId != timelineArgs.roomId) return false if (roomId != timelineArgs.roomId) return false
// Navigation to same room // Navigation to same room
if (!isThreadTimeLine()) { if (!isThreadTimeLine()) {
if (rootThreadEventId != null) { if (rootThreadEventId != null && userPreferencesProvider.areThreadMessagesEnabled()) {
// Thread link, so PermalinkHandler will handle the navigation // Thread link, so PermalinkHandler will handle the navigation
return false return false
} }

10
vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
View file

@ -22,6 +22,7 @@ import androidx.core.net.toUri
import im.vector.app.R import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.extensions.isIgnored import im.vector.app.core.extensions.isIgnored
import im.vector.app.core.resources.UserPreferencesProvider
import im.vector.app.core.utils.toast import im.vector.app.core.utils.toast
import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs
import im.vector.app.features.navigation.Navigator import im.vector.app.features.navigation.Navigator
@ -40,6 +41,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomType
import javax.inject.Inject import javax.inject.Inject
class PermalinkHandler @Inject constructor(private val activeSessionHolder: ActiveSessionHolder, class PermalinkHandler @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
private val userPreferencesProvider: UserPreferencesProvider,
private val navigator: Navigator) { private val navigator: Navigator) {
suspend fun launch( suspend fun launch(
@ -200,15 +202,17 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
roomSummary: RoomSummary roomSummary: RoomSummary
) { ) {
if (this?.navToRoom(roomId, eventId, rawLink, rootThreadEventId) != true) { if (this?.navToRoom(roomId, eventId, rawLink, rootThreadEventId) != true) {
rootThreadEventId?.let { if (rootThreadEventId != null && userPreferencesProvider.areThreadMessagesEnabled()) {
val threadTimelineArgs = ThreadTimelineArgs( val threadTimelineArgs = ThreadTimelineArgs(
roomId = roomId, roomId = roomId,
displayName = roomSummary.displayName, displayName = roomSummary.displayName,
avatarUrl = roomSummary.avatarUrl, avatarUrl = roomSummary.avatarUrl,
roomEncryptionTrustLevel = roomSummary.roomEncryptionTrustLevel, roomEncryptionTrustLevel = roomSummary.roomEncryptionTrustLevel,
rootThreadEventId = it) rootThreadEventId = rootThreadEventId)
navigator.openThread(context, threadTimelineArgs, eventId) navigator.openThread(context, threadTimelineArgs, eventId)
} ?: navigator.openRoom(context, roomId, eventId, buildTask) } else {
navigator.openRoom(context, roomId, eventId, buildTask)
}
} }
} }