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 off menu item

Browse Source
This commit is contained in:
charles
2022-12-05 10:53:32 +11:00
parent 84ee3eba21
commit 92123b2417
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,6 +62,12 @@ object ConversationMenuHelper {
item.actionView.setOnClickListener { onOptionsItemSelected(item) }
}
val menu = item.subMenu
// Expiring messages
if (thread.expireMessages == 0 && !isOpenGroup &&
(thread.hasApprovedMe() || thread.isClosedGroupRecipient || thread.isLocalNumber)
) {
inflater.inflate(R.menu.menu_conversation_expiration_off, menu)
}
// One-on-one chat menu (options that should only be present for one-on-one chats)
if (thread.isContactRecipient) {
if (thread.isBlocked) {
@@ -132,6 +138,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_off -> { showExpirationSettings(context, thread) }
R.id.menu_unblock -> { unblock(context, thread) }
R.id.menu_block -> { block(context, thread, deleteThread = false) }
R.id.menu_block_delete -> { blockAndDelete(context, thread) }