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

Unverified Commit acd57f2a authored by Ashley Soucar's avatar Ashley Soucar Committed by GitHub
Browse files

Merge pull request #9217 from shamim-emon/fix-issue-7935 

Fix: In widget tapping a non main account email redirects to the main account inbox when unified inbox is disabled
parents fd5c5f11 61a14d3b

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

+6 −4
Original line number Diff line number Diff line
@@ -418,9 +418,8 @@ open class MessageList : 
        }



        val launchData = decodeExtrasToLaunchData(intent)

        // If Unified Inbox was disabled show default account instead

        val search = if (launchData.search.isUnifiedInbox && !K9.isShowUnifiedInbox) {

            createDefaultLocalSearch()

            createDefaultLocalSearch(uuid = launchData.messageReference?.accountUuid)

        } else {

            launchData.search

        }
@@ -579,8 +578,10 @@ open class MessageList : 
        return LaunchData(search)

    }



    private fun createDefaultLocalSearch(): LocalSearch {

        val account = preferences.defaultAccount ?: error("No default account available")

    private fun createDefaultLocalSearch(uuid: String? = null): LocalSearch {

        val account = uuid?.let { preferences.getAccount(it) } ?: run {

            preferences.defaultAccount ?: error("No default account available")

        }

        return LocalSearch().apply {

            addAccountUuid(account.uuid)

            addAllowedFolder(defaultFolderProvider.getDefaultFolder(account))
@@ -1195,6 +1196,7 @@ open class MessageList : 
        expandSearchView()

        return true

    }



    override fun startSearch(query: String, account: LegacyAccount?, folderId: Long?): Boolean {

        // If this search was started from a MessageList of a single folder, pass along that folder info

        // so that we can enable remote search.