From 582eda8480dd6f57c3c02c2b614d9da2e25576df Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Wed, 14 May 2025 19:03:08 +0200 Subject: [PATCH] merge conflicts Signed-off-by: sowjanyakch --- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 69525125a..6a5c26314 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -2906,12 +2906,6 @@ class ChatActivity : searchItem.isVisible = CapabilitiesUtil.isUnifiedSearchAvailable(spreedCapabilities) && currentConversation!!.remoteServer.isNullOrEmpty() - if (currentConversation!!.remoteServer != null || - !CapabilitiesUtil.isSharedItemsAvailable(spreedCapabilities) - ) { - menu.removeItem(R.id.shared_items) - } - if (CapabilitiesUtil.isAbleToCall(spreedCapabilities)) { conversationVoiceCallMenuItem = menu.findItem(R.id.conversation_voice_call) conversationVideoMenuItem = menu.findItem(R.id.conversation_video_call)