Skip to content

able to schedule messages in note to self conversation #5945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sowjanyakch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

able to schedule messages in note to self conversation #5945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
7 changes: 2 additions & 5 deletions app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
Loading