Fix account could be null when deleted and update it from local search (f8ed50e2) · Commits · e / os / Mail

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

+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()