Merge remote-tracking branch 'upstream/develop' into picture-in-picture

2 files changed, 33 insertions, 3 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index bf22e71f5..7ec96dbbe 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -389,17 +389,29 @@ public class QueueFragment extends Fragment {
         itemTouchHelper = new ItemTouchHelper(
             new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.RIGHT) {
 
+                // Position tracking whilst dragging
+                int dragFrom = -1;
+                int dragTo = -1;
+
                 @Override
                 public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+                    int fromPosition = viewHolder.getAdapterPosition();
+                    int toPosition = target.getAdapterPosition();
+
+                    // Update tracked position
+                    if(dragFrom == -1) {
+                        dragFrom =  fromPosition;
+                    }
+                    dragTo = toPosition;
+
                     int from = viewHolder.getAdapterPosition();
                     int to = target.getAdapterPosition();
-                    Log.d(TAG, "move(" + from + ", " + to + ")");
+                    Log.d(TAG, "move(" + from + ", " + to + ") in memory");
                     if(from >= queue.size() || to >= queue.size()) {
                         return false;
                     }
                     queue.add(to, queue.remove(from));
                     recyclerAdapter.notifyItemMoved(from, to);
-                    DBWriter.moveQueueItem(from, to, true);
                     return true;
                 }
 
@@ -453,12 +465,25 @@ public class QueueFragment extends Fragment {
                                       RecyclerView.ViewHolder viewHolder) {
                     super.clearView(recyclerView, viewHolder);
 
+                    // Check if drag finished
+                    if(dragFrom != -1 && dragTo != -1 && dragFrom != dragTo) {
+                        reallyMoved(dragFrom, dragTo);
+                    }
+
+                    dragFrom = dragTo = -1;
+
                     if (viewHolder instanceof QueueRecyclerAdapter.ItemTouchHelperViewHolder) {
                         QueueRecyclerAdapter.ItemTouchHelperViewHolder itemViewHolder =
                                 (QueueRecyclerAdapter.ItemTouchHelperViewHolder) viewHolder;
                         itemViewHolder.onItemClear();
                     }
                 }
+
+                private void reallyMoved(int from, int to) {
+                    // Write drag operation to database
+                    Log.d(TAG, "Write to database move(" + dragFrom + ", " + dragTo + ")");
+                    DBWriter.moveQueueItem(dragFrom, dragTo, true);
+                }
             }
         );
         itemTouchHelper.attachToRecyclerView(recyclerView);
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 b5e0f1e99..0f42dd01a 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -764,6 +764,10 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         }
     }
 
+    private static String blankIfNull(String val) {
+        return val == null ? "" : val;
+    }
+
     private void buildAutodownloadSelectedNetworsPreference() {
         final Activity activity = ui.getActivity();
 
@@ -778,7 +782,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
             Log.e(TAG, "Couldn't get list of configure Wi-Fi networks");
             return;
         }
-        Collections.sort(networks, (x, y) -> x.SSID.compareTo(y.SSID));
+        Collections.sort(networks, (x, y) ->
+                blankIfNull(x.SSID).compareTo(blankIfNull(y.SSID)));
         selectedNetworks = new CheckBoxPreference[networks.size()];
         List<String> prefValues = Arrays.asList(UserPreferences
                 .getAutodownloadSelectedNetworks());