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

Fix disappearing messages menu item title

Browse Source
This commit is contained in:
charles
2022-12-21 13:00:21 +11:00
parent 4cfa8002d6
commit 2ed271271a
6 changed files with 4 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
View File

@@ -610,8 +610,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
menu,
menuInflater,
recipient,
this,
viewModel.expirationConfiguration
this
)
}
viewModel.recipient?.let { maybeUpdateToolbar(it) }

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

@@ -47,8 +47,7 @@ object ConversationMenuHelper {
menu: Menu,
inflater: MenuInflater,
thread: Recipient,
context: Context,
config: ExpirationConfiguration?
context: Context
) {
// Prepare
menu.clear()
@@ -57,11 +56,7 @@ object ConversationMenuHelper {
inflater.inflate(R.menu.menu_conversation, menu)
// Expiring messages
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)
}
inflater.inflate(R.menu.menu_conversation_expiration, menu)
}
// One-on-one chat menu (options that should only be present for one-on-one chats)
if (thread.isContactRecipient) {
@@ -134,7 +129,6 @@ object ConversationMenuHelper {
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) }
R.id.menu_block_delete -> { blockAndDelete(context, thread) }