Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Just go back to the timeline if the user is already viewing the DM with the other user. #6549

Merged
merged 2 commits into from
Jul 18, 2022
Merged

Just go back to the timeline if the user is already viewing the DM with the other user. #6549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c10678
Just go back to the timeline if the user is already viewing the DM wi…
bmarty Jul 13, 2022
d10d8d7
Changelog
bmarty Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/6549.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix infinite loading when opening a DM when the current room is the same DM.
1 change: 1 addition & 0 deletions vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailPendingAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package im.vector.app.features.home.room.detail

sealed class RoomDetailPendingAction {
object DoNothing : RoomDetailPendingAction()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am just wondering if this action is really needed since we will do nothing when receiving it? Does it work without any declared action?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is needed to finish RoomProfileActivity at this point https://github.com/vector-im/element-android/blob/develop/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt#L117

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see thanks for explaining.

data class JumpToReadReceipt(val userId: String) : RoomDetailPendingAction()
data class MentionUser(val userId: String) : RoomDetailPendingAction()
data class OpenRoom(val roomId: String, val closeCurrentRoom: Boolean = false) : RoomDetailPendingAction()
Expand Down
1 change: 1 addition & 0 deletions vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,6 +1323,7 @@ class TimelineFragment @Inject constructor(

private fun handlePendingAction(roomDetailPendingAction: RoomDetailPendingAction) {
when (roomDetailPendingAction) {
RoomDetailPendingAction.DoNothing -> Unit
is RoomDetailPendingAction.JumpToReadReceipt ->
timelineViewModel.handle(RoomDetailAction.JumpToReadReceipt(roomDetailPendingAction.userId))
is RoomDetailPendingAction.MentionUser ->
Expand Down
6 changes: 6 additions & 0 deletions vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ class RoomMemberProfileFragment @Inject constructor(
is RoomMemberProfileViewEvents.OnBanActionSuccess -> Unit
is RoomMemberProfileViewEvents.OnIgnoreActionSuccess -> Unit
is RoomMemberProfileViewEvents.OnInviteActionSuccess -> Unit
RoomMemberProfileViewEvents.GoBack -> handleGoBack()
}
}
setupLongClicks()
Expand Down Expand Up @@ -309,6 +310,11 @@ class RoomMemberProfileFragment @Inject constructor(
viewModel.handle(RoomMemberProfileAction.OpenOrCreateDm(fragmentArgs.userId))
}

private fun handleGoBack() {
roomDetailPendingActionStore.data = RoomDetailPendingAction.DoNothing
vectorBaseActivity.finish()
}

override fun onJumpToReadReceiptClicked() {
roomDetailPendingActionStore.data = RoomDetailPendingAction.JumpToReadReceipt(fragmentArgs.userId)
vectorBaseActivity.finish()
Expand Down
1 change: 1 addition & 0 deletions vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ sealed class RoomMemberProfileViewEvents : VectorViewEvents {

data class ShareRoomMemberProfile(val permalink: String) : RoomMemberProfileViewEvents()
data class OpenRoom(val roomId: String) : RoomMemberProfileViewEvents()
object GoBack : RoomMemberProfileViewEvents()
}
3 changes: 3 additions & 0 deletions vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
}
if (roomId != initialState.roomId) {
_viewEvents.post(RoomMemberProfileViewEvents.OpenRoom(roomId = roomId))
} else {
// Just go back to the previous screen (timeline)
_viewEvents.post(RoomMemberProfileViewEvents.GoBack)
}
}
}
Expand Down