Fix #1308 Crash when long pressing a note and swiping to the edge of the screen

Signed-off-by: Stefan Niedermann <info@niedermann.it>

2 files changed, 8 insertions, 1 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
index 5508beb6..7470fa25 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
@@ -170,6 +170,10 @@ public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> i
         return itemList.get(notePosition);
     }
 
+    public boolean hasItemPosition(int notePosition) {
+        return notePosition >= 0 && notePosition < itemList.size();
+    }
+
     public void remove(@NonNull Item item) {
         itemList.remove(item);
         notifyDataSetChanged();
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/selection/ItemSelectionTracker.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/selection/ItemSelectionTracker.java
index 4031c47e..bce834e2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/selection/ItemSelectionTracker.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/selection/ItemSelectionTracker.java
@@ -31,7 +31,10 @@ public class ItemSelectionTracker {
                     @Override
                     public boolean canSetStateAtPosition(int position, boolean nextState) {
                         @Nullable Integer swipedPosition = adapter.getSwipedPosition();
-                        return !adapter.getItem(position).isSection() && (swipedPosition == null || swipedPosition != position);
+                        if (!adapter.hasItemPosition(position)) {
+                            return false;
+                        }
+                        return (swipedPosition == null || swipedPosition != position) && !adapter.getItem(position).isSection();
                     }
 
                     @Override