Fix for issues with drag/drop

1 files changed, 6 insertions, 34 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
index 8af8a26b..68ade3cc 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
@@ -188,40 +188,7 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
 		FastScroller fastScroller = (FastScroller) rootView.findViewById(R.id.download_fast_scroller);
 		fastScroller.attachRecyclerView(playlistView);
 		setupLayoutManager(playlistView, false);
-		ItemTouchHelper touchHelper = new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
-			@Override
-			public boolean onMove(RecyclerView recyclerView, final RecyclerView.ViewHolder fromHolder, final RecyclerView.ViewHolder toHolder) {
-				new SilentBackgroundTask<Void>(context) {
-					private int from;
-					private int to;
-
-					@Override
-					protected Void doInBackground() throws Throwable {
-						from = fromHolder.getAdapterPosition();
-						to = toHolder.getAdapterPosition();
-						getDownloadService().swap(true, from, to);
-						return null;
-					}
-
-					@Override
-					protected void done(Void result) {
-						songListAdapter.notifyItemMoved(from, to);
-					}
-				}.execute();
-
-				return true;
-			}
-
-			@Override
-			public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
-				SongView songView = (SongView) ((UpdateView.UpdateViewHolder) viewHolder).getUpdateView();
-				DownloadFile downloadFile = songView.getDownloadFile();
-
-				DownloadService downloadService = getDownloadService();
-				downloadService.remove(downloadFile);
-				songListAdapter.removeItem(downloadFile);
-			}
-		});
+		ItemTouchHelper touchHelper = new ItemTouchHelper(new DownloadFileItemHelperCallback(this, true));
 		touchHelper.attachToRecyclerView(playlistView);
 
 		starButton = (ImageButton)rootView.findViewById(R.id.download_star);
@@ -860,6 +827,11 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
 		}
 	}
 
+	@Override
+	public SectionAdapter getCurrentAdapter() {
+		return songListAdapter;
+	}
+
 	private void scheduleHideControls() {
 		if (hideControlsFuture != null) {
 			hideControlsFuture.cancel(false);