From 75a369dcf32f9ccd4978697f6624e38925ca6ccc Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 17 Jan 2020 13:52:01 -0600
Subject: [PATCH] Fix drag and drop in paged caldav/google lists

---
 .../java/org/tasks/tasklist/DragAndDropRecyclerAdapter.java  | 5 +++++
 .../java/org/tasks/tasklist/PagedListRecyclerAdapter.java    | 5 +++++
 .../java/org/tasks/tasklist/TaskListRecyclerAdapter.java     | 4 +++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.java b/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.java
index 1fa4182da..f613de727 100644
--- a/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.java
+++ b/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.java
@@ -66,6 +66,11 @@ public class DragAndDropRecyclerAdapter extends TaskListRecyclerAdapter {
             .subscribe(this::applyDiff));
   }
 
+  @Override
+  protected boolean dragAndDropEnabled() {
+    return adapter.supportsParentingOrManualSort();
+  }
+
   @Override
   public TaskContainer getItem(int position) {
     return list.get(position);
diff --git a/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.java b/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.java
index 030a1ebe2..2d439d04a 100644
--- a/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.java
+++ b/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.java
@@ -51,6 +51,11 @@ public class PagedListRecyclerAdapter extends TaskListRecyclerAdapter {
     recyclerView.getLayoutManager().onRestoreInstanceState(recyclerViewState);
   }
 
+  @Override
+  protected boolean dragAndDropEnabled() {
+    return false;
+  }
+
   @Override
   public int getItemCount() {
     return differ.getItemCount();
diff --git a/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java b/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java
index bf4b7c176..7d88f3164 100644
--- a/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java
+++ b/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java
@@ -80,7 +80,7 @@ public abstract class TaskListRecyclerAdapter extends RecyclerView.Adapter<ViewH
 
   @Override
   public boolean onLongPress(ViewHolder viewHolder) {
-    if (!adapter.supportsParentingOrManualSort()) {
+    if (!dragAndDropEnabled()) {
       taskList.startActionMode();
     }
     if (taskList.isActionModeActive() && !viewHolder.isMoving()) {
@@ -89,6 +89,8 @@ public abstract class TaskListRecyclerAdapter extends RecyclerView.Adapter<ViewH
     return true;
   }
 
+  protected abstract boolean dragAndDropEnabled();
+
   @Override
   public void toggleSubtasks(TaskContainer task, boolean collapsed) {
     taskDao.setCollapsed(task.getId(), collapsed);