Skip to content

Commit 2220ba3

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

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
@@ -3442,8 +3442,7 @@ class ChatActivity :
34423442
}
34433443

34443444
scheduledMessagesMenuItem?.isVisible = networkMonitor.isOnline.value &&
3445-
hasScheduledMessages &&
3446-
!ConversationUtils.isNoteToSelfConversation(currentConversation)
3445+
hasScheduledMessages
34473446

34483447
val searchItem = menu.findItem(R.id.conversation_search)
34493448
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
@@ -79,7 +79,6 @@ import com.nextcloud.talk.users.UserManager
7979
import com.nextcloud.talk.utils.ApiUtils
8080
import com.nextcloud.talk.utils.CapabilitiesUtil
8181
import com.nextcloud.talk.utils.CharPolicy
82-
import com.nextcloud.talk.utils.ConversationUtils
8382
import com.nextcloud.talk.utils.DateUtils
8483
import com.nextcloud.talk.utils.EmojiTextInputEditText
8584
import com.nextcloud.talk.utils.ImageEmojiEditText
@@ -1055,13 +1054,11 @@ class MessageInputFragment : Fragment() {
10551054

10561055
popupMenu.menu.findItem(R.id.send_later)?.isVisible =
10571056
networkMonitor.isOnline.value &&
1058-
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES) &&
1059-
!ConversationUtils.isNoteToSelfConversation(chatActivity.currentConversation)
1057+
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES)
10601058

10611059
popupMenu.menu.findItem(R.id.send_later_without_notification)?.isVisible = networkMonitor.isOnline.value &&
10621060
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SILENT_SEND) &&
1063-
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES) &&
1064-
!ConversationUtils.isNoteToSelfConversation(chatActivity.currentConversation)
1061+
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES)
10651062

10661063
popupMenu.setOnMenuItemClickListener { item: MenuItem ->
10671064
when (item.itemId) {

0 commit comments

Comments
 (0)