wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6438 from thundernest/fix_message_view_menu

Browse source 
Only let the active message view update the toolbar menu
This commit is contained in:
cketti 2022-10-25 17:27:43 +02:00 committed by GitHub
commit e120b551d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
View file

@ -107,6 +107,12 @@ class MessageViewFragment :
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// Hide the toolbar menu when first creating this fragment. The menu will be set to visible once this fragment
// becomes the active page of the view pager in MessageViewContainerFragment.
if (savedInstanceState == null) {
setMenuVisibility(false)
}
setHasOptionsMenu(true)
messageReference = MessageReference.parse(arguments?.getString(ARG_REFERENCE))
@ -178,9 +184,10 @@ class MessageViewFragment :
}
override fun setMenuVisibility(menuVisible: Boolean) {
super.setMenuVisibility(menuVisible)
isActive = menuVisible
super.setMenuVisibility(menuVisible)
if (menuVisible) {
messageLoaderHelper.resumeCryptoOperationIfNecessary()
} else {
@ -207,6 +214,8 @@ class MessageViewFragment :
}
override fun onPrepareOptionsMenu(menu: Menu) {
if (!isActive) return
menu.findItem(R.id.delete).apply {
isVisible = K9.isMessageViewDeleteActionVisible
isEnabled = !isDeleteMenuItemDisabled