From 239999294499b010a6d6c018f5bdc2bf7182ac89 Mon Sep 17 00:00:00 2001
From: ByteHamster <ByteHamster@users.noreply.github.com>
Date: Sun, 15 Dec 2024 14:17:26 +0100
Subject: [PATCH] Remember 'keep sorted' when selecting random sort (#7560)

---
 .../antennapod/ui/screen/queue/QueueFragment.java     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/queue/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/queue/QueueFragment.java
index ae469de0b..296ab4c8c 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/queue/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/queue/QueueFragment.java
@@ -548,6 +548,8 @@ public class QueueFragment extends Fragment implements MaterialToolbar.OnMenuIte
     }
 
     public static class QueueSortDialog extends ItemSortDialog {
+        boolean turnedOffKeepSortedForRandom = false;
+
         @Nullable
         @Override
         public View onCreateView(@NonNull LayoutInflater inflater,
@@ -573,9 +575,16 @@ public class QueueFragment extends Fragment implements MaterialToolbar.OnMenuIte
         @Override
         protected void onSelectionChanged() {
             super.onSelectionChanged();
-            viewBinding.keepSortedCheckbox.setEnabled(sortOrder != SortOrder.RANDOM);
             if (sortOrder == SortOrder.RANDOM) {
+                turnedOffKeepSortedForRandom |= viewBinding.keepSortedCheckbox.isChecked();
                 viewBinding.keepSortedCheckbox.setChecked(false);
+                viewBinding.keepSortedCheckbox.setEnabled(false);
+            } else {
+                if (turnedOffKeepSortedForRandom) {
+                    viewBinding.keepSortedCheckbox.setChecked(true);
+                    turnedOffKeepSortedForRandom = false;
+                }
+                viewBinding.keepSortedCheckbox.setEnabled(true);
             }
             UserPreferences.setQueueKeepSorted(viewBinding.keepSortedCheckbox.isChecked());
             UserPreferences.setQueueKeepSortedOrder(sortOrder);