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

Commit 59aac05a authored by cketti's avatar cketti
Browse files

Initialize `MessageViewFragment.messageReference` earlier

parent 0bb4695d

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

+5 −6
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ class MessageViewFragment : 


        setHasOptionsMenu(true)



        messageReference = MessageReference.parse(arguments?.getString(ARG_REFERENCE))

            ?: error("Invalid argument '$ARG_REFERENCE'")



        messageCryptoPresenter = MessageCryptoPresenter(messageCryptoMvpView)

        messageLoaderHelper = messageLoaderHelperFactory.createForMessageView(

            context = requireContext().applicationContext,
@@ -146,16 +149,12 @@ class MessageViewFragment : 
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

        super.onViewCreated(view, savedInstanceState)



        val messageReference = MessageReference.parse(arguments?.getString(ARG_REFERENCE))

            ?: error("Invalid argument '$ARG_REFERENCE'")



        displayMessage(messageReference)

        loadMessage(messageReference)

    }



    private fun displayMessage(messageReference: MessageReference) {

    private fun loadMessage(messageReference: MessageReference) {

        Timber.d("MessageViewFragment displaying message %s", messageReference)



        this.messageReference = messageReference

        account = accountManager.getAccount(messageReference.accountUuid)

            ?: error("Account ${messageReference.accountUuid} not found")