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

Go to Unified Inbox when pressing back in message list

Browse source
This commit is contained in:
cketti 2021-02-16 13:02:47 +01:00
parent 3457f69c56
commit 0121bab2e9
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -586,12 +586,20 @@ open class MessageList :
showMessageList()
} else {
if (isDrawerEnabled && account != null && supportFragmentManager.backStackEntryCount == 0) {
val defaultFolderId = defaultFolderProvider.getDefaultFolder(account!!)
val currentFolder = if (singleFolderMode) search!!.folderIds[0] else null
if (currentFolder == null || defaultFolderId != currentFolder) {
openFolderImmediately(defaultFolderId)
if (K9.isShowUnifiedInbox) {
if (search!!.id != SearchAccount.UNIFIED_INBOX) {
openUnifiedInbox()
} else {
super.onBackPressed()
}
} else {
super.onBackPressed()
val defaultFolderId = defaultFolderProvider.getDefaultFolder(account!!)
val currentFolder = if (singleFolderMode) search!!.folderIds[0] else null
if (currentFolder == null || defaultFolderId != currentFolder) {
openFolderImmediately(defaultFolderId)
} else {
super.onBackPressed()
}
}
} else {
super.onBackPressed()