diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-07-12 13:52:27 +0300 |
|---|---|---|
| committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2021-07-12 14:14:29 +0300 |
| commit | 16cf3e23ef3f7fd681a00bbd6a436f5319805dcd (patch) | |
| tree | 4d353c801f8e2e8e857c49b69818b807205756a7 | |
| parent | af76dbc49298b61c38a12c40d8f66a3382387c14 (diff) | |
#1025 Cancel DragListener if dragEvent has no localState
Signed-off-by: Stefan Niedermann <info@niedermann.it>
| -rw-r--r-- | app/pfungstadt/release/output-metadata.json | 18 | ||||
| -rw-r--r-- | cross-tab-drag-and-drop/src/main/java/it/niedermann/android/crosstabdnd/CrossTabDragAndDrop.java | 5 |
2 files changed, 5 insertions, 18 deletions
diff --git a/app/pfungstadt/release/output-metadata.json b/app/pfungstadt/release/output-metadata.json deleted file mode 100644 index 7ffb2adcf..000000000 --- a/app/pfungstadt/release/output-metadata.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 2, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "it.niedermann.nextcloud.deck.pfungstadt", - "variantName": "pfungstadtRelease", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "versionCode": 1018003, - "versionName": "1.18.3", - "outputFile": "app-pfungstadt-release.apk" - } - ] -}
\ No newline at end of file diff --git a/cross-tab-drag-and-drop/src/main/java/it/niedermann/android/crosstabdnd/CrossTabDragAndDrop.java b/cross-tab-drag-and-drop/src/main/java/it/niedermann/android/crosstabdnd/CrossTabDragAndDrop.java index e22ad5f17..a51464ebc 100644 --- a/cross-tab-drag-and-drop/src/main/java/it/niedermann/android/crosstabdnd/CrossTabDragAndDrop.java +++ b/cross-tab-drag-and-drop/src/main/java/it/niedermann/android/crosstabdnd/CrossTabDragAndDrop.java @@ -52,6 +52,11 @@ public class CrossTabDragAndDrop< viewPager.setOnDragListener((View v, DragEvent dragEvent) -> { //noinspection unchecked final DraggedItemLocalState<TabFragment, ItemAdapter, ItemModel> draggedItemLocalState = (DraggedItemLocalState<TabFragment, ItemAdapter, ItemModel>) dragEvent.getLocalState(); + // https://github.com/stefan-niedermann/nextcloud-deck/issues/1025 + if (draggedItemLocalState == null) { + Log.v(TAG, "dragEvent has no localState → Cancelling DragListener."); + return false; + } final View draggedView = draggedItemLocalState.getDraggedView(); switch (dragEvent.getAction()) { case DragEvent.ACTION_DRAG_STARTED: { |