Fix crash on drag 'n' drop

1 files changed, 7 insertions, 4 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java
index 2cf030917..af1b13655 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java
@@ -56,10 +56,13 @@ public class CrossTabDragAndDrop {
                         }
                     }
 
-                    int viewUnderPosition = owner.getChildAdapterPosition(Objects.requireNonNull(owner.findChildViewUnder(dragEvent.getX(), dragEvent.getY())));
-                    if(viewUnderPosition != -1) {
-                        DeckLog.log(dragEvent.getAction() + " moved something...");
-                        Objects.requireNonNull(cardAdapter).moveItem(owner.getChildLayoutPosition(view), viewUnderPosition);
+                    View viewUnder = owner.findChildViewUnder(dragEvent.getX(), dragEvent.getY());
+                    if(viewUnder != null) {
+                        int viewUnderPosition = owner.getChildAdapterPosition(viewUnder);
+                        if (viewUnderPosition != -1) {
+                            DeckLog.log(dragEvent.getAction() + " moved something...");
+                            Objects.requireNonNull(cardAdapter).moveItem(owner.getChildLayoutPosition(view), viewUnderPosition);
+                        }
                     }
                     break;
                 case DragEvent.ACTION_DROP: