2 files changed, 18 insertions, 11 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
index 0e238eae2..6055582a3 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -6,10 +6,11 @@ import android.view.ContextMenu;
 import android.view.MenuInflater;
 import android.view.MotionEvent;
 import android.view.View;
-import androidx.recyclerview.widget.ItemTouchHelper;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.fragment.swipeactions.SwipeActions;
 import de.danoeh.antennapod.view.viewholder.EpisodeItemViewHolder;
 
 /**
@@ -18,13 +19,13 @@ import de.danoeh.antennapod.view.viewholder.EpisodeItemViewHolder;
 public class QueueRecyclerAdapter extends EpisodeItemListAdapter {
     private static final String TAG = "QueueRecyclerAdapter";
 
-    private final ItemTouchHelper itemTouchHelper;
+    private final SwipeActions swipeActions;
     private boolean dragDropEnabled;
 
 
-    public QueueRecyclerAdapter(MainActivity mainActivity, ItemTouchHelper itemTouchHelper) {
+    public QueueRecyclerAdapter(MainActivity mainActivity, SwipeActions swipeActions) {
         super(mainActivity);
-        this.itemTouchHelper = itemTouchHelper;
+        this.swipeActions = swipeActions;
         dragDropEnabled = ! (UserPreferences.isQueueKeepSorted() || UserPreferences.isQueueLocked());
     }
 
@@ -39,7 +40,7 @@ public class QueueRecyclerAdapter extends EpisodeItemListAdapter {
         View.OnTouchListener startDragTouchListener = (v1, event) -> {
             if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
                 Log.d(TAG, "startDrag()");
-                itemTouchHelper.startDrag(holder);
+                swipeActions.startDrag(holder);
             }
             return false;
         };
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SelectableAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SelectableAdapter.java
index 670357d16..43f749ff3 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/SelectableAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/SelectableAdapter.java
@@ -19,7 +19,7 @@ abstract class SelectableAdapter<T extends RecyclerView.ViewHolder> extends Recy
     private ActionMode actionMode;
     private final HashSet<Long> selectedIds = new HashSet<>();
     private final Activity activity;
-    private OnEndSelectModeListener onEndSelectModeListener;
+    private OnSelectModeListener onSelectModeListener;
 
     public SelectableAdapter(Activity activity) {
         this.activity = activity;
@@ -30,6 +30,10 @@ abstract class SelectableAdapter<T extends RecyclerView.ViewHolder> extends Recy
             endSelectMode();
         }
 
+        if (onSelectModeListener != null) {
+            onSelectModeListener.onStartSelectMode();
+        }
+
         selectedIds.clear();
         selectedIds.add(getItemId(pos));
         notifyDataSetChanged();
@@ -152,17 +156,19 @@ abstract class SelectableAdapter<T extends RecyclerView.ViewHolder> extends Recy
                 selectedIds.size(), getItemCount()));
     }
 
-    public void setOnEndSelectModeListener(OnEndSelectModeListener onEndSelectModeListener) {
-        this.onEndSelectModeListener = onEndSelectModeListener;
+    public void setOnSelectModeListener(OnSelectModeListener onSelectModeListener) {
+        this.onSelectModeListener = onSelectModeListener;
     }
 
     private void callOnEndSelectMode() {
-        if (onEndSelectModeListener != null) {
-            onEndSelectModeListener.onEndSelectMode();
+        if (onSelectModeListener != null) {
+            onSelectModeListener.onEndSelectMode();
         }
     }
 
-    public interface OnEndSelectModeListener {
+    public interface OnSelectModeListener {
+        void onStartSelectMode();
+
         void onEndSelectMode();
     }
 }