mirror of https://github.com/M66B/FairEmail.git
parent
351f931d8f
commit
d99d8d84aa
@ -1,56 +0,0 @@
|
|||||||
diff --git a/app/src/main/java/androidx/recyclerview/selection/DefaultSelectionTracker.java b/app/src/main/java/androidx/recyclerview/selection/DefaultSelectionTracker.java
|
|
||||||
index 61985cf8d..709308482 100644
|
|
||||||
--- a/app/src/main/java/androidx/recyclerview/selection/DefaultSelectionTracker.java
|
|
||||||
+++ b/app/src/main/java/androidx/recyclerview/selection/DefaultSelectionTracker.java
|
|
||||||
@@ -379,6 +379,10 @@ public class DefaultSelectionTracker<K> extends SelectionTracker<K> implements R
|
|
||||||
return mRange != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ boolean isOverlapping(int position, int count) {
|
|
||||||
+ return (mRange != null && mRange.isOverlapping(position, count));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
private boolean canSetState(@NonNull K key, boolean nextState) {
|
|
||||||
return mSelectionPredicate.canSetStateForKey(key, nextState);
|
|
||||||
}
|
|
||||||
@@ -601,17 +605,21 @@ public class DefaultSelectionTracker<K> extends SelectionTracker<K> implements R
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onItemRangeInserted(int startPosition, int itemCount) {
|
|
||||||
- mSelectionTracker.endRange();
|
|
||||||
+ if (mSelectionTracker.isOverlapping(startPosition, itemCount))
|
|
||||||
+ mSelectionTracker.endRange();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onItemRangeRemoved(int startPosition, int itemCount) {
|
|
||||||
- mSelectionTracker.endRange();
|
|
||||||
+ if (mSelectionTracker.isOverlapping(startPosition, itemCount))
|
|
||||||
+ mSelectionTracker.endRange();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
|
|
||||||
- mSelectionTracker.endRange();
|
|
||||||
+ if (mSelectionTracker.isOverlapping(fromPosition, itemCount) ||
|
|
||||||
+ mSelectionTracker.isOverlapping(toPosition, itemCount))
|
|
||||||
+ mSelectionTracker.endRange();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
diff --git a/app/src/main/java/androidx/recyclerview/selection/Range.java b/app/src/main/java/androidx/recyclerview/selection/Range.java
|
|
||||||
index 433e0d2cb..85ddeff94 100644
|
|
||||||
--- a/app/src/main/java/androidx/recyclerview/selection/Range.java
|
|
||||||
+++ b/app/src/main/java/androidx/recyclerview/selection/Range.java
|
|
||||||
@@ -169,6 +169,11 @@ final class Range {
|
|
||||||
mCallbacks.updateForRange(begin, end, selected, type);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ boolean isOverlapping(int position, int count) {
|
|
||||||
+ return (position >= mBegin && position <= mEnd) ||
|
|
||||||
+ (position + count >= mBegin && position + count <= mEnd);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "Range{begin=" + mBegin + ", end=" + mEnd + "}";
|
|
Loading…
Reference in new issue