Merge pull request #4320 from k9mail/GH-4301_no_folders_in_unified_inbox

Fix "folders displayed when Unified Inbox is selected" bug
thunderbird · Dec 2, 2019 · f443835 · f443835
2 parents 4d91d8e + b23be23
commit f443835
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/ui/src/main/java/com/fsck/k9/ui/K9Drawer.kt b/app/ui/src/main/java/com/fsck/k9/ui/K9Drawer.kt
@@ -193,7 +193,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
             val viewModelProvider = ViewModelProviders.of(parent, MessageListViewModelFactory())
             val viewModel = viewModelProvider.get(MessageListViewModel::class.java)
 
-            foldersLiveData?.removeObserver(foldersObserver)
+            removeFoldersObserver()
             foldersLiveData = viewModel.getFolders(account).apply {
                 observe(parent, foldersObserver)
             }
@@ -202,6 +202,11 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
         }
     }
 
+    private fun removeFoldersObserver() {
+        foldersLiveData?.removeObserver(foldersObserver)
+        foldersLiveData = null
+    }
+
     private fun updateFolderSettingsItem() {
         val drawerItem = drawer.getDrawerItem(DRAWER_ID_FOLDERS)!!
         drawerItem.isEnabled = !unifiedInboxSelected
@@ -297,6 +302,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
         selectedColor = 0
         accountHeader.setActiveProfile(DRAWER_ID_UNIFIED_INBOX)
         accountHeader.headerBackgroundView.setColorFilter(0xFFFFFFFFL.toInt(), PorterDuff.Mode.MULTIPLY)
+        removeFoldersObserver()
         clearUserFolders()
         updateFolderSettingsItem()
     }