From 672c38e20ae5c72ab3527343eb75bbc6a61ec2f2 Mon Sep 17 00:00:00 2001
From: Ross Harrison <rtharrison86@gmail.com>
Date: Sat, 31 Jan 2015 23:30:01 -0600
Subject: [PATCH 1/2] added preference, need to work into database

---
 .../antennapod/preferences/PreferenceController.java |  2 +-
 app/src/main/res/xml/preferences.xml                 | 12 ++++++++++++
 .../de/danoeh/antennapod/core/storage/DBWriter.java  |  8 +++++++-
 core/src/main/res/values/strings.xml                 |  2 ++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 41930a7f2..ba934b35b 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -58,9 +58,9 @@ public class PreferenceController {
     public static final String PREF_GPODNET_LOGOUT = "pref_gpodnet_logout";
     public static final String PREF_GPODNET_HOSTNAME = "pref_gpodnet_hostname";
     public static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
+    public static final String PREF_QUEUE_ADD_TO_FRONT = "prefQueueAddToFront";
     private static final String PREF_PERSISTENT_NOTIFICATION = "prefPersistNotify";
 
-
     private final PreferenceUI ui;
 
     private CheckBoxPreference[] selectedNetworks;
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 5175acdcb..88feccc4d 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -93,6 +93,18 @@
         </PreferenceScreen>
 
     </PreferenceCategory>
+
+
+    <PreferenceCategory android:title="@string/queue_label">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="prefQueueAddToFront"
+            android:summary="@string/pref_queueAddToFront_sum"
+            android:title="@string/pref_queueAddToFront_title"/>
+        />
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/services_label">
         <PreferenceScreen
             android:key="prefFlattrSettings"
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
index d71d19433..7efc43429 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
@@ -377,7 +377,13 @@ public class DBWriter {
                                         context, itemIds[i]);
 
                                 if (item != null) {
-                                    queue.add(item);
+                                    // add item to either front ot back of queue
+                                    if(PreferenceManager){
+                                        queue.add(0, item);
+                                    }else{
+                                        queue.add(item);
+                                    }
+
                                     queueModified = true;
                                     if (!item.isRead()) {
                                         item.setRead(true);
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 86f46a330..532b5d75d 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -257,6 +257,8 @@
     <string name="pref_persistNotify_title">Persistent playback controls</string>
     <string name="pref_persistNotify_sum">Keep notification and lockscreen controls when playback is paused.</string>
     <string name="pref_expand_notify_unsupport_toast">Android versions before 4.1 do not support expanded notifications.</string>
+    <string name="pref_queueAddToFront_sum">Add new episodes to the front of the queue.</string>
+    <string name="pref_queueAddToFront_title">Enqueue at front.</string>
 
     <!-- Auto-Flattr dialog -->
     <string name="auto_flattr_enable">Enable automatic flattring</string>

From 509b2a7f58390a740088fbc7904302ee99af9a42 Mon Sep 17 00:00:00 2001
From: Ross Harrison <rtharrison86@gmail.com>
Date: Sun, 1 Feb 2015 00:29:46 -0600
Subject: [PATCH 2/2] queue to front or back

---
 .../preferences/PreferenceController.java     |  2 --
 app/src/main/res/xml/preferences.xml          | 24 +++++++++----------
 .../antennapod/core/storage/DBWriter.java     |  6 ++++-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index ba934b35b..edaba5df3 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -58,8 +58,6 @@ public class PreferenceController {
     public static final String PREF_GPODNET_LOGOUT = "pref_gpodnet_logout";
     public static final String PREF_GPODNET_HOSTNAME = "pref_gpodnet_hostname";
     public static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
-    public static final String PREF_QUEUE_ADD_TO_FRONT = "prefQueueAddToFront";
-    private static final String PREF_PERSISTENT_NOTIFICATION = "prefPersistNotify";
 
     private final PreferenceUI ui;
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 88feccc4d..8675e07d7 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -22,11 +22,22 @@
             android:summary="@string/pref_persistNotify_sum"
             android:title="@string/pref_persistNotify_title"/>
     </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/queue_label">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="prefQueueAddToFront"
+            android:summary="@string/pref_queueAddToFront_sum"
+            android:title="@string/pref_queueAddToFront_title"/>
+        />
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/playback_pref">
         <CheckBoxPreference
             android:defaultValue="true"
             android:enabled="true"
-            android:key="prefPauseOnHeadsetDisconnect"
+            android:key="prefPauseOnHeadsetDisconnec"
             android:summary="@string/pref_pauseOnHeadsetDisconnect_sum"
             android:title="@string/pref_pauseOnHeadsetDisconnect_title"/>
         <CheckBoxPreference
@@ -94,17 +105,6 @@
 
     </PreferenceCategory>
 
-
-    <PreferenceCategory android:title="@string/queue_label">
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:enabled="true"
-            android:key="prefQueueAddToFront"
-            android:summary="@string/pref_queueAddToFront_sum"
-            android:title="@string/pref_queueAddToFront_title"/>
-        />
-    </PreferenceCategory>
-
     <PreferenceCategory android:title="@string/services_label">
         <PreferenceScreen
             android:key="prefFlattrSettings"
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
index 7efc43429..0ece66b08 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
@@ -43,6 +43,7 @@ import java.util.concurrent.ThreadFactory;
  */
 public class DBWriter {
     private static final String TAG = "DBWriter";
+    private static final String PREF_QUEUE_ADD_TO_FRONT = "prefQueueAddToFront";
 
     private static final ExecutorService dbExec;
 
@@ -378,7 +379,10 @@ public class DBWriter {
 
                                 if (item != null) {
                                     // add item to either front ot back of queue
-                                    if(PreferenceManager){
+                                    boolean addToFront = PreferenceManager.getDefaultSharedPreferences(context)
+                                            .getBoolean(PREF_QUEUE_ADD_TO_FRONT, false);
+
+                                    if(addToFront){
                                         queue.add(0, item);
                                     }else{
                                         queue.add(item);