Merge branch 'develop' into add-local-feeds

2 files changed, 45 insertions, 9 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/FeedFilterDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/FeedFilterDialog.java
index 7d1fe4026..3b0e2d04b 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/FeedFilterDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/FeedFilterDialog.java
@@ -6,6 +6,9 @@ import androidx.appcompat.app.AlertDialog;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.util.Arrays;
+import java.util.List;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
@@ -16,20 +19,15 @@ public class FeedFilterDialog {
         dialog.setTitle(context.getString(R.string.pref_filter_feed_title));
         dialog.setNegativeButton(android.R.string.cancel, (d, listener) -> d.dismiss());
 
-        int selectedIndexTemp = 0;
         int selected = UserPreferences.getFeedFilter();
-        String[] entryValues = context.getResources().getStringArray(R.array.nav_drawer_feed_filter_values);
-        for (int i = 0; i < entryValues.length; i++) {
-            if (Integer.parseInt(entryValues[i]) == selected) {
-                selectedIndexTemp = i;
-            }
-        }
+        List<String> entryValues =
+                Arrays.asList(context.getResources().getStringArray(R.array.nav_drawer_feed_filter_values));
+        final int selectedIndex = entryValues.indexOf("" + selected);
 
-        final int selectedIndex = selectedIndexTemp;
         String[] items = context.getResources().getStringArray(R.array.nav_drawer_feed_filter_options);
         dialog.setSingleChoiceItems(items, selectedIndex, (d, which) -> {
             if (selectedIndex != which) {
-                UserPreferences.setFeedFilter(entryValues[which]);
+                UserPreferences.setFeedFilter(entryValues.get(which));
                 //Update subscriptions
                 EventBus.getDefault().post(new UnreadItemsUpdateEvent());
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/FeedSortDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/FeedSortDialog.java
new file mode 100644
index 000000000..96d1b9b67
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/FeedSortDialog.java
@@ -0,0 +1,38 @@
+package de.danoeh.antennapod.dialog;
+
+import android.content.Context;
+
+import androidx.appcompat.app.AlertDialog;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.Arrays;
+import java.util.List;
+
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+
+public class FeedSortDialog {
+    public static void showDialog(Context context) {
+        AlertDialog.Builder dialog = new AlertDialog.Builder(context);
+        dialog.setTitle(context.getString(R.string.pref_nav_drawer_feed_order_title));
+        dialog.setNegativeButton(android.R.string.cancel, (d, listener) -> d.dismiss());
+
+        int selected = UserPreferences.getFeedOrder();
+        List<String> entryValues =
+                Arrays.asList(context.getResources().getStringArray(R.array.nav_drawer_feed_order_values));
+        final int selectedIndex = entryValues.indexOf("" + selected);
+
+        String[] items = context.getResources().getStringArray(R.array.nav_drawer_feed_order_options);
+        dialog.setSingleChoiceItems(items, selectedIndex, (d, which) -> {
+            if (selectedIndex != which) {
+                UserPreferences.setFeedOrder(entryValues.get(which));
+                //Update subscriptions
+                EventBus.getDefault().post(new UnreadItemsUpdateEvent());
+            }
+            d.dismiss();
+        });
+        dialog.show();
+    }
+}