wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
cketti 2021-02-08 12:58:06 +01:00
parent d5597e88cf
commit 2c2187e1fe
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -377,8 +377,8 @@ open class MessageList :
search!!.addAllowedFolder(folderId)
}
// edgecase: someone disabled unified view, while looking at unified view
if ((search != null) && (search!!.id == SearchAccount.UNIFIED_INBOX) && !K9.isShowUnifiedInbox) {
// Edge case: the Unified Inbox was disabled while it was being displayed
if (search != null && search!!.id == SearchAccount.UNIFIED_INBOX && !K9.isShowUnifiedInbox) {
search = null
}
@ -1426,7 +1426,7 @@ open class MessageList :
val drawer = drawer ?: return
when {
singleFolderMode -> drawer.selectFolder(search!!.folderIds[0])
// deselect the view since we're still looking at unified mailbox
// Don't select any item in the drawer because the Unified Inbox is displayed, but not listed in the drawer
search!!.id == SearchAccount.UNIFIED_INBOX && !K9.isShowUnifiedInbox -> drawer.deselect()
search!!.id == SearchAccount.UNIFIED_INBOX -> drawer.selectUnifiedInbox()
else -> drawer.deselect()

4
app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
View file

@ -240,9 +240,11 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
.withSelectedColor(selectedColor)
.withSelectedTextColor(accentColor)
.withName(R.string.integrated_inbox_title)
drawer.addItem(drawerItem)
drawer.addItem(DividerDrawerItem())
if (unifiedInboxSelected == true) {
if (unifiedInboxSelected) {
openedFolderDrawerId = DRAWER_ID_UNIFIED_INBOX
}
}