Skip to content

Commit dfdd453

Browse files
authored
Merge pull request #5945 from nextcloud/bugfix/scheduleMessages
able to schedule messages in note to self conversation
2 parents b4e3b98 + 7cefe24 commit dfdd453

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3094,8 +3094,7 @@ class ChatActivity :
30943094
}
30953095

30963096
scheduledMessagesMenuItem?.isVisible = networkMonitor.isOnline.value &&
3097-
hasScheduledMessages &&
3098-
!ConversationUtils.isNoteToSelfConversation(currentConversation)
3097+
hasScheduledMessages
30993098

31003099
searchItem.isVisible =
31013100
hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.UNIFIED_SEARCH) &&

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ import com.nextcloud.talk.utils.ApiUtils
8282
import com.nextcloud.talk.utils.DisplayUtils
8383
import com.nextcloud.talk.utils.CapabilitiesUtil
8484
import com.nextcloud.talk.utils.CharPolicy
85-
import com.nextcloud.talk.utils.ConversationUtils
8685
import com.nextcloud.talk.utils.DateUtils
8786
import com.nextcloud.talk.utils.EmojiTextInputEditText
8887
import com.nextcloud.talk.utils.ImageEmojiEditText
@@ -1121,13 +1120,11 @@ class MessageInputFragment : Fragment() {
11211120

11221121
popupMenu.menu.findItem(R.id.send_later)?.isVisible =
11231122
networkMonitor.isOnline.value &&
1124-
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES) &&
1125-
!ConversationUtils.isNoteToSelfConversation(chatActivity.currentConversation)
1123+
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES)
11261124

11271125
popupMenu.menu.findItem(R.id.send_later_without_notification)?.isVisible = networkMonitor.isOnline.value &&
11281126
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SILENT_SEND) &&
1129-
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES) &&
1130-
!ConversationUtils.isNoteToSelfConversation(chatActivity.currentConversation)
1127+
CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SCHEDULED_MESSAGES)
11311128

11321129
popupMenu.setOnMenuItemClickListener { item: MenuItem ->
11331130
when (item.itemId) {

0 commit comments

Comments
 (0)