From 33d59b3ec6f18158df754eb3dc600da96b3882cb Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 17 Oct 2020 16:42:59 +0200 Subject: [PATCH] Hide timeline_settings This menu item was added upstream, but we already have the menu item show_room_info which does the same thing, and I prefer its wording to upstream. Change-Id: I065eeec4b3fdf4751978776566350823f2da5131 --- .../vector/app/features/home/room/detail/RoomDetailViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt index f9a8669744..de08e6c60f 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt @@ -546,7 +546,7 @@ class RoomDetailViewModel @AssistedInject constructor( // For now always disable when not in developer mode, worker cancellation is not working properly timeline.pendingEventCount() > 0 && vectorPreferences.developerMode() R.id.resend_all -> state.asyncRoomSummary()?.hasFailedSending == true - R.id.timeline_setting -> true + R.id.timeline_setting -> false // identical to show_room_info (downstream) R.id.invite -> state.canInvite R.id.clear_all -> state.asyncRoomSummary()?.hasFailedSending == true R.id.open_matrix_apps -> session.integrationManagerService().isIntegrationEnabled()