Skip to content

Commit 49c9696

Browse files
committed
adding missing bottomsheet handling for displaying the join room sheet when linking from the public rooms
- the activity is still finished causing the popup to not actually display
1 parent 792444d commit 49c9696

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@ import im.vector.app.core.extensions.addFragmentToBackstack
2828
import im.vector.app.core.extensions.popBackstack
2929
import im.vector.app.core.platform.VectorBaseActivity
3030
import im.vector.app.databinding.ActivitySimpleBinding
31+
import im.vector.app.features.matrixto.MatrixToBottomSheet
32+
import im.vector.app.features.navigation.Navigator
3133
import im.vector.app.features.roomdirectory.createroom.CreateRoomArgs
3234
import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment
3335
import im.vector.app.features.roomdirectory.picker.RoomDirectoryPickerFragment
3436
import javax.inject.Inject
3537

3638
@AndroidEntryPoint
37-
class RoomDirectoryActivity : VectorBaseActivity<ActivitySimpleBinding>() {
39+
class RoomDirectoryActivity : VectorBaseActivity<ActivitySimpleBinding>(), MatrixToBottomSheet.InteractionListener {
3840

3941
@Inject lateinit var roomDirectoryViewModelFactory: RoomDirectoryViewModel.Factory
4042
private val roomDirectoryViewModel: RoomDirectoryViewModel by viewModel()
@@ -81,6 +83,14 @@ class RoomDirectoryActivity : VectorBaseActivity<ActivitySimpleBinding>() {
8183
}
8284
}
8385

86+
override fun mxToBottomSheetNavigateToRoom(roomId: String) {
87+
navigator.openRoom(this, roomId)
88+
}
89+
90+
override fun mxToBottomSheetSwitchToSpace(spaceId: String) {
91+
navigator.switchToSpace(this, spaceId, Navigator.PostSwitchSpaceAction.None)
92+
}
93+
8494
companion object {
8595
private const val INITIAL_FILTER = "INITIAL_FILTER"
8696

0 commit comments

Comments
 (0)