From 018e142ee9b6bdf9faa24e74a4f714b1331370e7 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Tue, 22 Oct 2024 22:02:40 -0600 Subject: [PATCH] list: fix sort dialog allowing invalid sorts If you changed the mode but disabled the direction, you would wind up with an outright invalid sort that you could still save. Fix that. --- app/src/main/java/org/oxycblt/auxio/list/sort/SortDialog.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/oxycblt/auxio/list/sort/SortDialog.kt b/app/src/main/java/org/oxycblt/auxio/list/sort/SortDialog.kt index 8bdb31924..0072dd4ad 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/sort/SortDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/sort/SortDialog.kt @@ -96,17 +96,17 @@ abstract class SortDialog : private fun updateButtons() { val binding = requireBinding() - binding.sortSave.isEnabled = getCurrentSort() != getInitialSort() + binding.sortSave.isEnabled = getCurrentSort().let { it != null && it != getInitialSort() } } private fun getCurrentSort(): Sort? { val initial = getInitialSort() - val mode = modeAdapter.currentMode ?: initial?.mode ?: return null + val mode = modeAdapter.currentMode ?: return null val direction = when (requireBinding().sortDirectionGroup.checkedButtonId) { R.id.sort_direction_asc -> Sort.Direction.ASCENDING R.id.sort_direction_dsc -> Sort.Direction.DESCENDING - else -> initial?.direction ?: return null + else -> return null } return Sort(mode, direction) }