TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-09 22:52:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore disappearing messages menu item

Browse Source
This commit is contained in:
charles
2022-12-19 14:59:12 +11:00
parent 9d056ff15b
commit 644484b650
4 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
View File

@@ -56,10 +56,12 @@ object ConversationMenuHelper {
// Base menu (options that should always be present)
inflater.inflate(R.menu.menu_conversation, menu)
// Expiring messages
if (config?.isEnabled != true && !isOpenGroup &&
(thread.hasApprovedMe() || thread.isClosedGroupRecipient || thread.isLocalNumber)
) {
inflater.inflate(R.menu.menu_conversation_expiration_off, menu)
if (!isOpenGroup && (thread.hasApprovedMe() || thread.isClosedGroupRecipient || thread.isLocalNumber)) {
if (config?.isEnabled != true) {
inflater.inflate(R.menu.menu_conversation_expiration_off, menu)
} else {
inflater.inflate(R.menu.menu_conversation_expiration_on, menu)
}
}
// One-on-one chat menu (options that should only be present for one-on-one chats)
if (thread.isContactRecipient) {
@@ -131,6 +133,7 @@ object ConversationMenuHelper {
R.id.menu_view_all_media -> { showAllMedia(context, thread) }
R.id.menu_search -> { search(context) }
R.id.menu_add_shortcut -> { addShortcut(context, thread) }
R.id.menu_expiring_messages -> { showExpirationSettings(context, thread) }
R.id.menu_expiring_messages_off -> { showExpirationSettings(context, thread) }
R.id.menu_unblock -> { unblock(context, thread) }
R.id.menu_block -> { block(context, thread, deleteThread = false) }