From 9b37f00909ab5d2e3806ff157cb3928141beaef7 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 19 May 2019 08:11:27 +0200
Subject: [PATCH] Attempt to fix multiple selection keeping active

---
 .../selection/GestureSelectionHelper.java           |  2 +-
 recyclerview-selection.patch                        | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/androidx/recyclerview/selection/GestureSelectionHelper.java b/app/src/main/java/androidx/recyclerview/selection/GestureSelectionHelper.java
index 7f2a5bb252..3736ada49c 100644
--- a/app/src/main/java/androidx/recyclerview/selection/GestureSelectionHelper.java
+++ b/app/src/main/java/androidx/recyclerview/selection/GestureSelectionHelper.java
@@ -98,7 +98,7 @@ final class GestureSelectionHelper implements OnItemTouchListener {
             case MotionEvent.ACTION_MOVE:
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL:
-                return mStarted;
+                return mStarted && mSelectionMgr.isRangeActive();
             default:
                 return false;
         }
diff --git a/recyclerview-selection.patch b/recyclerview-selection.patch
index 8c60928c6a..331075f7bf 100644
--- a/recyclerview-selection.patch
+++ b/recyclerview-selection.patch
@@ -1,3 +1,16 @@
+diff --git a/app/src/main/java/androidx/recyclerview/selection/GestureSelectionHelper.java b/app/src/main/java/androidx/recyclerview/selection/GestureSelectionHelper.java
+index 7f2a5bb2..3736ada4 100644
+--- a/app/src/main/java/androidx/recyclerview/selection/GestureSelectionHelper.java
++++ b/app/src/main/java/androidx/recyclerview/selection/GestureSelectionHelper.java
+@@ -98,7 +98,7 @@ final class GestureSelectionHelper implements OnItemTouchListener {
+             case MotionEvent.ACTION_MOVE:
+             case MotionEvent.ACTION_UP:
+             case MotionEvent.ACTION_CANCEL:
+-                return mStarted;
++                return mStarted && mSelectionMgr.isRangeActive();
+             default:
+                 return false;
+         }
 diff --git a/app/src/main/java/androidx/recyclerview/selection/SelectionTracker.java b/app/src/main/java/androidx/recyclerview/selection/SelectionTracker.java
 index ae3785df..1591ff4b 100644
 --- a/app/src/main/java/androidx/recyclerview/selection/SelectionTracker.java