Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 185a08de authored by cketti's avatar cketti
Browse files

Remove custom `updateMenu()` mechanism

parent 52b22ba2

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

+0 −4
Original line number Diff line number Diff line
@@ -1509,10 +1509,6 @@ open class MessageList : 
        invalidateMenu()

    }



    override fun updateMenu() {

        invalidateOptionsMenu()

    }



    override fun disableDeleteAction() {

        menu!!.findItem(R.id.delete).isEnabled = false

    }

app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt

+5 −2
Original line number Diff line number Diff line
@@ -1493,7 +1493,7 @@ class MessageListFragment : 
            savedListState = null

        }



        fragmentListener.updateMenu()

        invalidateMenu()



        currentFolder?.let { currentFolder ->

            currentFolder.moreMessages = messageListInfo.hasMoreMessages
@@ -1591,6 +1591,10 @@ class MessageListFragment : 
        resetActionMode()

    }



    private fun invalidateMenu() {

        requireActivity().invalidateMenu()

    }



    val isCheckMailSupported: Boolean

        get() = allAccounts || !isSingleAccountMode || !isSingleFolderMode || isRemoteFolder
@@ -1949,7 +1953,6 @@ class MessageListFragment : 
        fun startSearch(query: String, account: Account?, folderId: Long?): Boolean

        fun remoteSearchStarted()

        fun goBack()

        fun updateMenu()

        fun onFolderNotFoundError()



        companion object {

app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java

+7 −4
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF 
        mAccount = Preferences.getPreferences(getApplicationContext()).getAccount(mMessageReference.getAccountUuid());

        messageLoaderHelper.asyncStartOrResumeLoadingMessage(messageReference, null);



        mFragmentListener.updateMenu();

        invalidateMenu();

    }



    private void hideKeyboard() {
@@ -281,7 +281,7 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF 
            mMessageView.getMessageHeaderView().setCryptoStatusLoading();

        }

        displaySubject(message.getSubject());

        mFragmentListener.updateMenu();

        invalidateMenu();

    }



    private void displaySubject(String subject) {
@@ -517,7 +517,7 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF 
                    Collections.singletonList(mMessage), Flag.SEEN, !mMessage.isSet(Flag.SEEN));



            mMessageView.setHeaders(mMessage, mAccount, true);

            mFragmentListener.updateMenu();

            invalidateMenu();

        }

    }
@@ -773,7 +773,6 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF 
        void onReply(MessageReference messageReference, @Nullable Parcelable decryptionResultForReply);

        void setProgress(boolean b);

        void showNextMessageOrReturn();

        void updateMenu();

    }



    public boolean isInitialized() {
@@ -884,6 +883,10 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF 
        return new AttachmentController(mController, this, attachment);

    }



    private void invalidateMenu() {

        requireActivity().invalidateMenu();

    }



    private enum FolderOperation {

        COPY, MOVE

    }