Always show all folders in "Manage folders" screen (26049b89) · Commits · e / os / Mail

legacy/ui/folder/src/main/java/app/k9mail/legacy/ui/folder/DisplayFolderRepository.kt

+8 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,14 @@ class DisplayFolderRepository(
		}.sortedWith(sortForDisplay)
		}

		fun getDisplayFoldersFlow(account: Account, includeHiddenFolders: Boolean): Flow<List<DisplayFolder>> {
		return if (includeHiddenFolders) {
		getDisplayFoldersFlow(account, FolderMode.ALL)
		} else {
		getDisplayFoldersFlow(account.uuid)
		}
		}

		fun getDisplayFoldersFlow(account: Account, displayMode: Account.FolderMode): Flow<List<DisplayFolder>> {
		val messageStore = messageStoreManager.getMessageStore(account.uuid)

+0 −11

Original line number	Diff line number	Diff line
		@@ -121,10 +121,6 @@ class ManageFoldersFragment : Fragment() {
		override fun onOptionsItemSelected(item: MenuItem): Boolean {
		when (item.itemId) {
		R.id.list_folders -> refreshFolderList()
		R.id.display_1st_class -> setDisplayMode(Account.FolderMode.FIRST_CLASS)
		R.id.display_1st_and_2nd_class -> setDisplayMode(Account.FolderMode.FIRST_AND_SECOND_CLASS)
		R.id.display_not_second_class -> setDisplayMode(Account.FolderMode.NOT_SECOND_CLASS)
		R.id.display_all -> setDisplayMode(Account.FolderMode.ALL)
		else -> return super.onOptionsItemSelected(item)
		}

		@@ -135,13 +131,6 @@ class ManageFoldersFragment : Fragment() {
		messagingController.refreshFolderList(account)
		}

		private fun setDisplayMode(newMode: Account.FolderMode) {
		account.folderDisplayMode = newMode
		preferences.saveAccount(account)

		itemAdapter.filter(null)
		}

		private fun folderListFilter(item: FolderListItem, constraint: CharSequence?): Boolean {
		if (constraint.isNullOrEmpty()) return true

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,6 +11,6 @@ class ManageFoldersViewModel(
		private val folderRepository: DisplayFolderRepository,
		) : ViewModel() {
		fun getFolders(account: Account): LiveData<List<DisplayFolder>> {
		return folderRepository.getDisplayFoldersFlow(account.uuid).asLiveData()
		return folderRepository.getDisplayFoldersFlow(account, includeHiddenFolders = true).asLiveData()
		}
		}

+0 −23

Original line number	Diff line number	Diff line
		@@ -10,29 +10,6 @@
		app:showAsAction="collapseActionView\|ifRoom"
		app:actionViewClass="androidx.appcompat.widget.SearchView"
		/>
		<item
		android:icon="@drawable/ic_inbox"
		android:title="@string/folder_list_display_mode_label"
		>
		<menu>
		<item
		android:id="@+id/display_all"
		android:title="@string/folder_list_display_mode_all"
		/>
		<item
		android:id="@+id/display_1st_class"
		android:title="@string/folder_list_display_mode_first_class"
		/>
		<item
		android:id="@+id/display_1st_and_2nd_class"
		android:title="@string/folder_list_display_mode_first_and_second_class"
		/>
		<item
		android:id="@+id/display_not_second_class"
		android:title="@string/folder_list_display_mode_not_second_class"
		/>
		</menu>
		</item>
		<item
		android:id="@+id/list_folders"
		android:icon="@drawable/ic_refresh"