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

Unverified Commit 78834dc8 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #9191 from wmontwe/fix-issue-9190

Fix account could be null when deleted
parents 8301203e f8ed50e2
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -1424,11 +1424,11 @@ open class MessageList :
        actionBar.setHomeAsUpIndicator(Icons.Outlined.Menu)
    }

    private fun initializeFromLocalSearch(search: LocalSearch?) {
    private fun initializeFromLocalSearch(search: LocalSearch) {
        this.search = search
        singleFolderMode = false

        if (!search!!.searchAllAccounts()) {
        if (search.searchAllAccounts()) {
            val accountUuids = search.accountUuids
            if (accountUuids.size == 1) {
                account = accountManager.getAccount(accountUuids[0])
@@ -1437,6 +1437,10 @@ open class MessageList :
            } else {
                account = null
            }
        } else {
            if (account == null && search.accountUuids.size == 1) {
                account = accountManager.getAccount(search.accountUuids[0])
            }
        }

        configureDrawer()