refactor(dnd): centralize import validation and simplify touch handling

Author: jatezzz

app/src/main/java/com/itsaky/androidide/dnd/GitUrlDropTarget.kt

@@ -39,12 +39,9 @@ internal class GitUrlDropTarget(
     }
 
     private fun handleDroppedRepositoryContent(payload: ContentInfoCompat): ContentInfoCompat? {
-        if (!shouldAcceptDrop()) {
-            return payload
-        }
+        if (!shouldAcceptDrop()) return payload
 
-        val droppedText = extractDroppedText(payload) ?: return payload
-        val repositoryUrl = parseGitRepositoryUrl(droppedText) ?: return payload
+        val repositoryUrl = extractRepositoryUrl(payload) ?: return payload
 
         onRepositoryDropped(repositoryUrl)
         return null
@@ -99,14 +96,15 @@ internal class GitUrlDropTarget(
         }
     }
 
-    private fun extractDroppedText(payload: ContentInfoCompat): String? {
+    private fun extractRepositoryUrl(payload: ContentInfoCompat): String? {
         val clip = payload.clip
         for (index in 0 until clip.itemCount) {
             val item = clip.getItemAt(index)
             val text = item.uri?.toString() ?: item.coerceToText(context)?.toString()
-            if (!text.isNullOrBlank()) {
-                return text
-            }
+
+            if (text.isNullOrBlank()) continue
+
+            parseGitRepositoryUrl(text)?.let { return it }
         }
 
         return null

app/src/main/java/com/itsaky/androidide/fragments/sidebar/FileTreeDropController.kt

@@ -45,7 +45,7 @@ internal class FileTreeDropController(
   }
 
   private fun handleDragEvent(view: View, target: DropTarget, event: DragEvent): Boolean {
-    val canHandleDrop = event.hasDroppedContent()
+    val canHandleDrop = event.hasImportableContent(activity)
 
     return when (event.action) {
       DragEvent.ACTION_DRAG_STARTED -> canHandleDrop
@@ -135,10 +135,7 @@ internal class FileTreeDropController(
 
     var importedCount = 0
     for (index in 0 until clipData.itemCount) {
-      val uri = clipData.getItemAt(index).toExternalUri() ?: continue
-      if (uri.isInternalDragUri(context)) {
-        continue
-      }
+      val uri = clipData.getItemAt(index).toImportableExternalUri(context) ?: continue
 
       val defaultName = context.getString(R.string.msg_file_tree_drop_default_name)
       val rawName = uri.getFileName(context).ifBlank { defaultName }
@@ -180,6 +177,24 @@ internal class FileTreeDropController(
     }
   }
 
+  private fun ClipData.Item.toImportableExternalUri(context: Context): Uri? {
+    val resolvedUri = toExternalUri() ?: return null
+    return resolvedUri.takeUnless { it.isInternalDragUri(context) }
+  }
+
+  private fun DragEvent.hasImportableContent(context: Context): Boolean {
+    if (localState != null) return false
+
+    val clip = clipData ?: return false
+    for (index in 0 until clip.itemCount) {
+        if (clip.getItemAt(index).toImportableExternalUri(context) != null) {
+            return true
+        }
+    }
+
+    return false
+  }
+
   private fun ClipData.Item.toExternalUri(): Uri? {
     return uri
       ?: text?.toString()
@@ -209,11 +224,6 @@ internal class FileTreeDropController(
     }
   }
 
-  private fun DragEvent.hasDroppedContent(): Boolean {
-    if (localState != null) return false
-    return clipDescription != null || (clipData?.itemCount ?: 0) > 0
-  }
-
   private fun createAvailableTargetFile(directory: File, originalName: String): File {
     val dotIndex = originalName.lastIndexOf('.')
     val hasExtension = dotIndex > 0 && dotIndex < originalName.lastIndex

treeview/src/main/java/com/unnamed/b/atv/view/NodeTouchHandler.java

@@ -33,17 +33,32 @@ class NodeTouchHandler implements View.OnTouchListener {
     public boolean onTouch(View v, MotionEvent event) {
         gestureDetector.onTouchEvent(event);
 
-        if (event.getAction() == MotionEvent.ACTION_UP || event.getAction() == MotionEvent.ACTION_CANCEL) {
-            isAwaitingDrag = false;
-            view.setPressed(false);
-        } else if (event.getAction() == MotionEvent.ACTION_MOVE && isAwaitingDrag) {
-            isAwaitingDrag = false;
-            dispatchDrag();
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                resetTouchState();
+                break;
+
+            case MotionEvent.ACTION_MOVE:
+                handleMove();
+                break;
         }
 
         return true;
     }
 
+    private void resetTouchState() {
+        isAwaitingDrag = false;
+        view.setPressed(false);
+    }
+
+    private void handleMove() {
+        if (!isAwaitingDrag) return;
+
+        isAwaitingDrag = false;
+        dispatchDrag();
+    }
+
     private void dispatchDrag() {
         TreeNode.TreeNodeDragListener listener = node.getDragListener() != null
             ? node.getDragListener()