fix(filetree): improve drag robustness, handle partial imports gracefully, and secure file handling

Author: jatezzz

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

@@ -3,6 +3,7 @@ package com.itsaky.androidide.fragments.sidebar
 import android.app.Activity
 import android.content.ClipData
 import android.content.Context
+import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.view.DragEvent
 import android.view.View
@@ -23,6 +24,11 @@ internal class FileTreeDropController(
 ) {
 
   private data class DropTarget(val node: TreeNode?, val file: File)
+  private sealed interface ImportResult {
+    data class Success(val count: Int) : ImportResult
+    data class PartialSuccess(val count: Int, val error: Throwable) : ImportResult
+    data class Failure(val error: Throwable) : ImportResult
+  }
 
   val nodeBinder = FileTreeViewHolder.ExternalDropHandler { node, file, view ->
     bindDropTarget(view, DropTarget(node, file))
@@ -88,33 +94,40 @@ internal class FileTreeDropController(
       } finally {
         dragPermissions?.release()
       }
-    }) { copiedCount, error ->
-      if (activity.isFinishing || activity.isDestroyed) {
-        return@executeAsyncProvideError
-      }
+    }) { result, catastrophicError ->
+      if (activity.isFinishing || activity.isDestroyed) return@executeAsyncProvideError
 
-      if (error != null) {
-        onDropFailed(
-          error.cause?.message
-            ?: error.message
-            ?: context.getString(R.string.msg_file_tree_drop_import_failed)
-        )
-        return@executeAsyncProvideError
-      }
+      fun Throwable.toErrorMsg() = cause?.message ?: message ?: context.getString(R.string.msg_file_tree_drop_import_failed)
 
-      val importedCount = copiedCount ?: 0
-      if (importedCount <= 0) {
-        onDropFailed(context.getString(R.string.msg_file_tree_drop_no_files))
+      if (catastrophicError != null) {
+        onDropFailed(catastrophicError.toErrorMsg())
         return@executeAsyncProvideError
       }
 
-      onDropCompleted(target.node, target.file, importedCount)
+      when (result) {
+        is ImportResult.Success -> {
+          if (result.count > 0) {
+            onDropCompleted(target.node, target.file, result.count)
+          } else {
+            onDropFailed(context.getString(R.string.msg_file_tree_drop_no_files))
+          }
+        }
+        is ImportResult.PartialSuccess -> {
+          onDropCompleted(target.node, target.file, result.count)
+          onDropFailed(result.error.toErrorMsg())
+        }
+        is ImportResult.Failure -> {
+          onDropFailed(result.error.toErrorMsg())
+        }
+
+				else -> {}
+			}
     }
 
     return true
   }
 
-  private fun copyDroppedFiles(context: Context, clipData: ClipData, targetFile: File): Int {
+  private fun copyDroppedFiles(context: Context, clipData: ClipData, targetFile: File): ImportResult {
     val targetDirectory = resolveTargetDirectory(targetFile)
     require(targetDirectory.exists() && targetDirectory.isDirectory) {
       context.getString(R.string.msg_file_tree_drop_destination_missing)
@@ -127,21 +140,35 @@ internal class FileTreeDropController(
         continue
       }
 
-      val sourceName =
-        uri.getFileName(context).ifBlank { context.getString(R.string.msg_file_tree_drop_default_name) }
-      val destinationFile = createAvailableTargetFile(targetDirectory, sourceName)
+      val defaultName = context.getString(R.string.msg_file_tree_drop_default_name)
+      val rawName = uri.getFileName(context).ifBlank { defaultName }
+
+      var sanitizedName = rawName.substringAfterLast('/').substringAfterLast('\\')
 
-      UriFileImporter.copyUriToFile(
-        context = context,
-        uri = uri,
-        destinationFile = destinationFile,
-        onOpenFailed = { IllegalStateException(context.getString(R.string.msg_file_tree_drop_read_failed, sourceName)) },
-      )
+      if (sanitizedName == "." || sanitizedName == ".." || sanitizedName.isBlank()) {
+        sanitizedName = defaultName
+      }
+
+      val destinationFile = createAvailableTargetFile(targetDirectory, sanitizedName)
 
-      importedCount++
+      try {
+        UriFileImporter.copyUriToFile(
+          context = context,
+          uri = uri,
+          destinationFile = destinationFile,
+          onOpenFailed = { IllegalStateException(context.getString(R.string.msg_file_tree_drop_read_failed, sanitizedName)) },
+        )
+        importedCount++
+      } catch (e: Exception) {
+        return if (importedCount > 0) {
+          ImportResult.PartialSuccess(importedCount, e)
+        } else {
+          ImportResult.Failure(e)
+        }
+      }
     }
 
-    return importedCount
+    return ImportResult.Success(importedCount)
   }
 
   private fun resolveTargetDirectory(targetFile: File): File {
@@ -165,15 +192,25 @@ internal class FileTreeDropController(
   }
 
   private fun showDropHighlight(view: View) {
+    if (view.getTag(R.id.filetree_drop_target_tag) == null) {
+      view.setTag(R.id.filetree_drop_target_tag, view.background ?: "NULL_BG")
+    }
+
     val baseColor = ContextCompat.getColor(activity, R.color.teal_200)
     view.setBackgroundColor((baseColor and 0x00FFFFFF) or (64 shl 24))
   }
 
   private fun clearDropHighlight(view: View) {
-    view.background = null
+    val savedBg = view.getTag(R.id.filetree_drop_target_tag)
+    if (savedBg != null) {
+      view.background = if (savedBg == "NULL_BG") null else savedBg as? Drawable
+
+      view.setTag(R.id.filetree_drop_target_tag, null)
+    }
   }
 
   private fun DragEvent.hasDroppedContent(): Boolean {
+    if (localState != null) return false
     return clipDescription != null || (clipData?.itemCount ?: 0) > 0
   }
 

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

@@ -226,8 +226,7 @@ class FileTreeFragment : BottomSheetDialogFragment(), TreeNodeClickListener,
     try {
       val contentUri = FileProvider.getUriForFile(context, authority, file)
 
-      val extension = MimeTypeMap.getFileExtensionFromUrl(file.name)
-      val mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
+      val mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(file.extension.lowercase())
         ?: "application/octet-stream"
 
       val clipData = ClipData(
@@ -239,7 +238,7 @@ class FileTreeFragment : BottomSheetDialogFragment(), TreeNodeClickListener,
       val shadow = View.DragShadowBuilder(view)
       val flags = View.DRAG_FLAG_GLOBAL or View.DRAG_FLAG_GLOBAL_URI_READ
 
-      ViewCompat.startDragAndDrop(view, clipData, shadow, null, flags)
+      ViewCompat.startDragAndDrop(view, clipData, shadow, true, flags)
     } catch (e: Exception) {
       e.printStackTrace()
     }

app/src/main/java/com/itsaky/androidide/tasks/callables/FileTreeCallable.java

@@ -54,6 +54,8 @@ public Boolean call() throws Exception {
   }
 
   private void populateChildren(File[] files, TreeNode parent) {
+    if (files == null) return;
+
     Arrays.sort(files, new SortFileName());
     Arrays.sort(files, new SortFolder());
     for (File file : files) {

app/src/main/java/com/itsaky/androidide/utils/UriFileImporter.kt

@@ -43,13 +43,13 @@ object UriFileImporter {
   fun getDisplayName(contentResolver: ContentResolver, uri: Uri): String? {
     return try {
       when (uri.scheme) {
-        "content" -> queryDisplayName(contentResolver, uri)
+        "content" -> queryDisplayName(contentResolver, uri) ?: uri.lastPathSegment
         "file" -> uri.lastPathSegment
         else -> uri.lastPathSegment
       }
     } catch (e: Exception) {
       Log.e(TAG, "Error getting filename from URI", e)
-      null
+      uri.lastPathSegment
     }
   }
 

git-core/src/main/java/com/itsaky/androidide/git/core/GitRepositoryUrls.kt

@@ -3,7 +3,7 @@ package com.itsaky.androidide.git.core
 import java.net.URI
 import java.net.URISyntaxException
 
-private val sshGitUrlRegex = Regex("^git@[^\\s:]+:\\S+(?:\\.git)?$")
+private val sshGitUrlRegex = Regex("^[^\\s@/]+@[^\\s:/]+:\\S+$")
 private val supportedGitSchemes = setOf("http", "https", "git", "ssh")
 
 fun parseGitRepositoryUrl(rawText: String): String? {
@@ -34,9 +34,12 @@ fun parseGitRepositoryUrl(rawText: String): String? {
 
     val path = uri.path ?: ""
     val pathSegments = path.split("/").filter { it.isNotBlank() }
-    val looksLikeRepositoryPath = pathSegments.size >= 2 || path.endsWith(".git")
 
-    if (!looksLikeRepositoryPath) {
+    val isExplicitGitUrl = path.endsWith(".git")
+    val webUiIndicators = setOf("tree", "blob", "raw", "commits", "commit", "pull", "issues", "releases", "tags", "branches", "-")
+    val hasWebUiSegments = pathSegments.any { it in webUiIndicators }
+
+    if (!isExplicitGitUrl && (pathSegments.size < 2 || hasWebUiSegments || !uri.query.isNullOrBlank())) {
         return null
     }
 
@@ -47,7 +50,7 @@ fun parseGitRepositoryUrl(rawText: String): String? {
             uri.host,
             uri.port,
             uri.path,
-            uri.query,
+            if (isExplicitGitUrl) uri.query else null,
             null
         ).toString()
     } catch (_: URISyntaxException) {