Skip to content

ADFA-1840: Fix project deletion to remove hidden backups and handle partial failures#588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Daniel-ADFA wants to merge 5 commits into from
Closed

ADFA-1840: Fix project deletion to remove hidden backups and handle partial failures #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f67c5c6
ADFA-1840 Fix project deletion to remove hidden backups and handle pa…
Daniel-ADFA Nov 6, 2025
0727bb3
ADFA-1840: Fix FileDeleteUtils
Daniel-ADFA Nov 6, 2025
aaba6f5
ADFA-1840: Fix FileDeleteUtils
Daniel-ADFA Nov 6, 2025
6346cb4
ADFA-1840: Fix project deletion to remove hidden backups and handle p…
Daniel-ADFA Nov 6, 2025
0696f38
fix: resolve incomplete project deletion and race conditions
Daniel-ADFA Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions app/src/main/java/com/itsaky/androidide/activities/MainActivity.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@

package com.itsaky.androidide.activities

import android.app.AlertDialog
import android.content.Intent
import android.os.Bundle
import android.text.TextUtils
Expand All@@ -29,13 +28,14 @@ import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope
import androidx.transition.TransitionManager
import androidx.transition.doOnEnd
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import com.google.android.material.transition.MaterialSharedAxis
import com.itsaky.androidide.FeedbackButtonManager
import com.itsaky.androidide.R
import com.itsaky.androidide.activities.editor.EditorActivityKt
import com.itsaky.androidide.analytics.IAnalyticsManager
import com.itsaky.androidide.app.EdgeToEdgeIDEActivity
import com.itsaky.androidide.databinding.ActivityMainBinding
import com.itsaky.androidide.idetooltips.TooltipManager
import com.itsaky.androidide.idetooltips.TooltipTag.PROJECT_RECENT_TOP
import com.itsaky.androidide.idetooltips.TooltipTag.SETUP_OVERVIEW
import com.itsaky.androidide.preferences.internal.GeneralPreferences
Expand All@@ -44,7 +44,9 @@ import com.itsaky.androidide.resources.R.string
import com.itsaky.androidide.templates.ITemplateProvider
import com.itsaky.androidide.utils.DialogUtils
import com.itsaky.androidide.utils.Environment
import com.itsaky.androidide.utils.FeatureFlags
import com.itsaky.androidide.utils.FileDeleteUtils
import com.itsaky.androidide.utils.UrlManager
import com.itsaky.androidide.utils.flashInfo
import com.itsaky.androidide.viewmodel.MainViewModel
import com.itsaky.androidide.viewmodel.MainViewModel.Companion.SCREEN_DELETE_PROJECTS
Expand All@@ -53,19 +55,16 @@ import com.itsaky.androidide.viewmodel.MainViewModel.Companion.SCREEN_SAVED_PROJ
import com.itsaky.androidide.viewmodel.MainViewModel.Companion.SCREEN_TEMPLATE_DETAILS
import com.itsaky.androidide.viewmodel.MainViewModel.Companion.SCREEN_TEMPLATE_LIST
import com.itsaky.androidide.viewmodel.MainViewModel.Companion.TOOLTIPS_WEB_VIEW
import io.sentry.Sentry
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.appdevforall.localwebserver.ServerConfig
import org.appdevforall.localwebserver.WebServer
import org.koin.android.ext.android.inject
import org.slf4j.LoggerFactory
import java.io.File

import com.itsaky.androidide.idetooltips.TooltipManager
import com.itsaky.androidide.FeedbackButtonManager
import com.itsaky.androidide.R
import com.itsaky.androidide.utils.FeatureFlags
import com.itsaky.androidide.utils.UrlManager

class MainActivity : EdgeToEdgeIDEActivity() {

private val log = LoggerFactory.getLogger(MainActivity::class.java)
Expand DownExpand Up@@ -323,13 +322,13 @@ class MainActivity : EdgeToEdgeIDEActivity() {
startActivity(intent)
}

internal fun deleteProject(root: File) {
internal suspend fun deleteProject(root: File): Boolean {
ProjectManagerImpl.getInstance().projectPath = root.absolutePath
try {
return runCatching {
FileDeleteUtils.deleteRecursive(root)
} catch (e: Exception) {
flashInfo(string.msg_delete_existing_project_failed)
}
}.onFailure { t ->
Sentry.captureException(t)
}.getOrDefault(false)
}

private fun startWebServer() {
Expand Down
24 changes: 16 additions & 8 deletions app/src/main/java/com/itsaky/androidide/adapters/RecentProjectsAdapter.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@ import android.view.animation.AnimationUtils
import androidx.appcompat.app.AlertDialog
import android.widget.PopupWindow
import androidx.appcompat.widget.TooltipCompat
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.RecyclerView
import com.blankj.utilcode.util.FileUtils
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.textfield.TextInputLayout
import kotlinx.coroutines.launch
import com.itsaky.androidide.R
import com.itsaky.androidide.activities.MainActivity
import com.itsaky.androidide.databinding.SavedRecentProjectItemBinding
import com.itsaky.androidide.idetooltips.TooltipManager
import com.itsaky.androidide.idetooltips.TooltipTag.DELETE_PROJECT
Expand All@@ -25,10 +27,10 @@ import com.itsaky.androidide.idetooltips.TooltipTag.PROJECT_RECENT_RENAME
import com.itsaky.androidide.idetooltips.TooltipTag.PROJECT_OPEN_FOLDER
import com.itsaky.androidide.idetooltips.TooltipTag.PROJECT_RECENT_TOP
import com.itsaky.androidide.idetooltips.TooltipTag.PROJECT_RENAME_DIALOG
import com.itsaky.androidide.tasks.executeAsync
import com.itsaky.androidide.utils.applyLongPressRecursively
import com.itsaky.androidide.utils.flashError
import com.itsaky.androidide.utils.flashSuccess
import io.sentry.Sentry
import org.appdevforall.codeonthego.layouteditor.ProjectFile
import org.appdevforall.codeonthego.layouteditor.databinding.TextinputlayoutBinding
import java.io.File
Expand DownExpand Up@@ -211,11 +213,15 @@ class RecentProjectsAdapter(
.setMessage(R.string.msg_delete_project)
.setNegativeButton(R.string.no) { dialog, _ -> dialog.dismiss() }
.setPositiveButton(R.string.yes) { _, _ ->
onRemoveProjectClick(project)
executeAsync({ FileUtils.delete(project.path) }) {
val deleted = it ?: false
if (!deleted) {
return@executeAsync
val mainActivity = context as? MainActivity
mainActivity?.lifecycleScope?.launch {
val deleted = mainActivity.deleteProject(File(project.path))

if (deleted) {
onRemoveProjectClick(project)
mainActivity.flashSuccess(R.string.deleted)
} else {
mainActivity.flashError(R.string.delete_failed)
}
}
}
Expand DownExpand Up@@ -248,7 +254,8 @@ class RecentProjectsAdapter(
binding.textinputEdittext.setText(project.name)
binding.textinputLayout.hint = context.getString(R.string.msg_new_project_name)
val padding = (16 * context.resources.displayMetrics.density).toInt()
builder.setView(binding.root, padding, padding, padding, padding)
binding.root.setPadding(padding, padding, padding, padding)
builder.setView(binding.root)

builder.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
builder.setPositiveButton(R.string.rename) { _, _ ->
Expand All@@ -260,6 +267,7 @@ class RecentProjectsAdapter(
onFileRenamed(RenamedFile(oldName, newName, newPath))
notifyItemChanged(position)
} catch (e: Exception) {
Sentry.captureException(e)
flashError(R.string.rename_failed)
}
}
Expand Down
34 changes: 21 additions & 13 deletions app/src/main/java/com/itsaky/androidide/fragments/DeleteProjectFragment.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,12 @@ import com.itsaky.androidide.utils.flashError
import com.itsaky.androidide.utils.flashSuccess
import com.itsaky.androidide.viewmodel.MainViewModel
import com.itsaky.androidide.viewmodel.RecentProjectsViewModel
import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.io.File

class DeleteProjectFragment : BaseFragment() {
Expand DownExpand Up@@ -131,10 +137,6 @@ class DeleteProjectFragment : BaseFragment() {
}
}

private fun deleteProject(root: File) {
(requireActivity() as MainActivity).deleteProject(root)
}

fun showToolTip(
tag: String,
anchorView: View? = null
Expand All@@ -153,19 +155,25 @@ class DeleteProjectFragment : BaseFragment() {
.setMessage(R.string.msg_delete_selected_project)
.setNegativeButton(R.string.no) { dialog, _ -> dialog.dismiss() }
.setPositiveButton(R.string.yes) { _, _ ->
try {
adapter?.getSelectedProjects().let { locations ->
locations?.forEach {
deleteProject(File(it.path))
lifecycleScope.launch {
val locations = adapter?.getSelectedProjects()
if (locations.isNullOrEmpty()) return@launch

val results = locations.map { location ->
async(Dispatchers.IO) {
(activity as? MainActivity)?.deleteProject(File(location.path)) ?: false
}
val names = locations?.map { it.name }
if (names != null) {
}.awaitAll()
Comment on lines +162 to +166

@greptile-appsgreptile-appsBotNov 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Unnecessary dispatcher specification: async(Dispatchers.IO) is redundant since MainActivity.deleteProject() already uses withContext(Dispatchers.IO) internally at FileDeleteUtils.kt:13. The explicit dispatcher causes an extra thread context switch.

Suggested change
val results = locations.map { location ->
async(Dispatchers.IO) {
(activity as?MainActivity)?.deleteProject(File(location.path)) ?:false
}
val names = locations?.map { it.name }
if (names !=null) {
}.awaitAll()
val results = locations.map { location ->
async {
(activity as?MainActivity)?.deleteProject(File(location.path)) ?:false
}
}.awaitAll()


withContext(Dispatchers.Main) {
if (results.all { it }) {
val names = locations.map { it.name }
recentProjectsViewModel.deleteSelectedProjects(names)
requireActivity().flashSuccess(R.string.deleted)
} else {
requireActivity().flashError(R.string.delete_failed)
}
flashSuccess(R.string.deleted)
}
} catch (e: Exception) {
flashError(R.string.delete_failed)
}
}
.show()
Expand Down
67 changes: 43 additions & 24 deletions app/src/main/java/com/itsaky/androidide/utils/FileDeleteUtils.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
package com.itsaky.androidide.utils

import android.util.Log
import io.sentry.Sentry
import kotlinx.coroutines.*
import java.io.File
import java.io.IOException
Expand All@@ -9,34 +10,43 @@ object FileDeleteUtils {
private const val TAG = "FileDeleteUtils"


fun deleteRecursive(
fileOrDirectory: File,
onDeleted: (success: Boolean) -> Unit = {}
) {
suspend fun deleteRecursive(fileOrDirectory: File): Boolean = withContext(Dispatchers.IO) {
val hiddenFile = File(
fileOrDirectory.parentFile,
".${fileOrDirectory.name}"
)

CoroutineScope(Dispatchers.IO).launch {
try {

if (fileOrDirectory.isDirectory) {
val copied = fileOrDirectory.copyRecursively(hiddenFile, overwrite = false)
} else {
fileOrDirectory.copyTo(hiddenFile, overwrite = false)
Log.d(TAG, "File copy complete")
}
} catch (t: Throwable) {
Log.e(TAG, "Copy failed: ${t.message}", t)
if (hiddenFile.exists() && !fileOrDirectory.exists()) {
Log.w(TAG, "Cleaning up previous failed deletion: ${hiddenFile.absolutePath}")
if (!deleteRecursively(hiddenFile)) {
Log.e(TAG, "Failed to clean up hidden file: ${hiddenFile.absolutePath}")
return@withContext false
}
}

val deletedOriginal = deleteRecursively(fileOrDirectory)
if (fileOrDirectory.exists()) {
val renamed = runCatching {
fileOrDirectory.renameTo(hiddenFile)
}.onFailure { t ->
Log.e(TAG, "Failed to rename ${fileOrDirectory.absolutePath} to hidden: ${t.message}", t)
Sentry.captureException(t)
}.getOrDefault(false)

withContext(Dispatchers.Main) {
onDeleted(deletedOriginal)
if (!renamed) {
return@withContext false
}
} else if (!hiddenFile.exists()) {
Log.d(TAG, "File does not exist: ${fileOrDirectory.absolutePath}")
return@withContext true
}
Comment on lines +38 to 41

@greptile-appsgreptile-appsBotNov 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: Race condition: when fileOrDirectory doesn't exist but hiddenFile exists, the code skips renaming and proceeds to delete hiddenFile at line 43. However, this assumes hiddenFile is from a previous failed deletion. If fileOrDirectory was just deleted externally (race condition), attempting to delete an unrelated hiddenFile could delete the wrong data.

Suggested change
} elseif (!hiddenFile.exists()) {
Log.d(TAG, "File does not exist: ${fileOrDirectory.absolutePath}")
return@withContext true
}
} elseif (!hiddenFile.exists()) {
Log.d(TAG, "File does not exist: ${fileOrDirectory.absolutePath}")
return@withContext true
} else {
Log.w(TAG, "File does not exist but hidden file remains: ${hiddenFile.absolutePath}")
}


val deleted = deleteRecursively(hiddenFile)

if (!deleted) {
Log.w(TAG, "Hidden directory remains after deletion failure: ${hiddenFile.absolutePath}")
}

deleted
}

private fun deleteRecursively(file: File): Boolean {
Expand All@@ -45,23 +55,32 @@ object FileDeleteUtils {
val children = file.listFiles()
if (children != null) {
for (child in children) {
deleteRecursively(child)
if (!deleteRecursively(child)) {
Log.w(TAG, "Failed to delete: ${child.absolutePath}")
return false
}
}
}
}

val deleted = file.delete()
return deleted || !file.exists()
return file.delete().also { deleted ->
if (!deleted) {
Log.e(TAG, "Failed to delete: ${file.absolutePath}")
}
}

} catch (e: SecurityException) {
Log.e(TAG, "SecurityException deleting ${file.absolutePath}: ${e.message}", e)
return !file.exists()
Sentry.captureException(e)
return false
} catch (e: IOException) {
Log.e(TAG, "IOException deleting ${file.absolutePath}: ${e.message}", e)
return !file.exists()
Sentry.captureException(e)
return false
} catch (t: Throwable) {
Log.e(TAG, "Unexpected error deleting ${file.absolutePath}: ${t.message}", t)
return !file.exists()
Sentry.captureException(t)
return false
}
}
}