Don't invalidate the menu in `MessageList` (3fce0090) · Commits · e / os / Mail

app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt

+0 −9

Original line number	Diff line number	Diff line
		@@ -1028,8 +1028,6 @@ open class MessageList :
		if (displayMode == DisplayMode.SPLIT_VIEW) {
		showMessageViewPlaceHolder()
		}

		invalidateMenu()
		}

		private fun addMessageListFragment(fragment: MessageListFragment) {
		@@ -1121,11 +1119,6 @@ open class MessageList :
		fragmentTransaction.commit()
		}

		override fun remoteSearchStarted() {
		// Remove action button for remote search
		invalidateMenu()
		}

		override fun goBack() {
		val fragmentManager = supportFragmentManager
		when {
		@@ -1199,7 +1192,6 @@ open class MessageList :
		setDrawerLockState()

		showDefaultTitleView()
		invalidateMenu()

		onMessageListDisplayed()
		}
		@@ -1231,7 +1223,6 @@ open class MessageList :
		}

		showMessageTitleView()
		invalidateMenu()
		}

		private fun showDefaultTitleView() {

+3 −3

Original line number	Diff line number	Diff line
		@@ -141,6 +141,7 @@ class MessageListFragment :
		set(value) {
		field = value
		resetActionMode()
		invalidateMenu()
		}

		override fun onAttach(context: Context) {
		@@ -537,7 +538,7 @@ class MessageListFragment :
		activityListener
		)

		fragmentListener.remoteSearchStarted()
		invalidateMenu()
		}

		/**
		@@ -1619,7 +1620,7 @@ class MessageListFragment :
		}

		private fun invalidateMenu() {
		requireActivity().invalidateMenu()
		activity?.invalidateMenu()
		}

		private val isCheckMailSupported: Boolean
		@@ -1978,7 +1979,6 @@ class MessageListFragment :
		fun setMessageListTitle(title: String, subtitle: String?)
		fun onCompose(account: Account?)
		fun startSearch(query: String, account: Account?, folderId: Long?): Boolean
		fun remoteSearchStarted()
		fun goBack()
		fun onFolderNotFoundError()