Skip to content

Commit bf2f6f0

Browse files
committed
show scheduled messages in note to self conversation
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
1 parent 7909d5d commit bf2f6f0

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3430,8 +3430,7 @@ class ChatActivity :
34303430
}
34313431

34323432
scheduledMessagesMenuItem?.isVisible = networkMonitor.isOnline.value &&
3433-
hasScheduledMessages &&
3434-
!ConversationUtils.isNoteToSelfConversation(currentConversation)
3433+
hasScheduledMessages
34353434

34363435
val searchItem = menu.findItem(R.id.conversation_search)
34373436
searchItem.isVisible =

app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ import com.nextcloud.talk.utils.ApiUtils
8080
import com.nextcloud.talk.utils.DisplayUtils
8181
import com.nextcloud.talk.utils.CapabilitiesUtil
8282
import com.nextcloud.talk.utils.CharPolicy
83-
import com.nextcloud.talk.utils.ConversationUtils
8483
import com.nextcloud.talk.utils.DateUtils
8584
import com.nextcloud.talk.utils.EmojiTextInputEditText
8685
import com.nextcloud.talk.utils.ImageEmojiEditText
@@ -1061,13 +1060,11 @@ class MessageInputFragment : Fragment() {
10611060

10621061
popupMenu.menu.findItem(R.id.send_later)?.isVisible =
10631062
networkMonitor.isOnline.value &&
1064-
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES) &&
1065-
!ConversationUtils.isNoteToSelfConversation(chatActivity.currentConversation)
1063+
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES)
10661064

10671065
popupMenu.menu.findItem(R.id.send_later_without_notification)?.isVisible = networkMonitor.isOnline.value &&
10681066
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SILENT_SEND) &&
1069-
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES) &&
1070-
!ConversationUtils.isNoteToSelfConversation(chatActivity.currentConversation)
1067+
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES)
10711068

10721069
popupMenu.setOnMenuItemClickListener { item: MenuItem ->
10731070
when (item.itemId) {

0 commit comments

Comments
 (0)