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 af69f2c873..ecde97d267 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -3442,8 +3442,7 @@ class ChatActivity : } scheduledMessagesMenuItem?.isVisible = networkMonitor.isOnline.value && - hasScheduledMessages && - !ConversationUtils.isNoteToSelfConversation(currentConversation) + hasScheduledMessages val searchItem = menu.findItem(R.id.conversation_search) searchItem.isVisible = diff --git a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt index 44d92b58cb..c758f18b53 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt @@ -79,7 +79,6 @@ import com.nextcloud.talk.users.UserManager import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.CapabilitiesUtil import com.nextcloud.talk.utils.CharPolicy -import com.nextcloud.talk.utils.ConversationUtils import com.nextcloud.talk.utils.DateUtils import com.nextcloud.talk.utils.EmojiTextInputEditText import com.nextcloud.talk.utils.ImageEmojiEditText @@ -1055,13 +1054,11 @@ class MessageInputFragment : Fragment() { popupMenu.menu.findItem(R.id.send_later)?.isVisible = networkMonitor.isOnline.value && - CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES) && - !ConversationUtils.isNoteToSelfConversation(chatActivity.currentConversation) + CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES) popupMenu.menu.findItem(R.id.send_later_without_notification)?.isVisible = networkMonitor.isOnline.value && CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SILENT_SEND) && - CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES) && - !ConversationUtils.isNoteToSelfConversation(chatActivity.currentConversation) + CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES) popupMenu.setOnMenuItemClickListener { item: MenuItem -> when (item.itemId) {