Skip to content

ADFA-2977: Fix stale editor tabs persisting across projects after crash #1057

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

Merged
Daniel-ADFA merged 2 commits into from
Mar 10, 2026
Merged

ADFA-2977: Fix stale editor tabs persisting across projects after crash #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
379111b
ADFA-2977:Fix stale editor tabs persisting across projects after crash
Daniel-ADFA Mar 9, 2026
776ad6e
Merge branch 'stage' into ADFA-2977
Daniel-ADFA Mar 10, 2026
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
18 changes: 16 additions & 2 deletions app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,11 @@ open class EditorHandlerActivity :
return@observeFiles
}
getOpenedFiles().also {
val cache = OpenedFilesCache(currentFile, it)
val cache = OpenedFilesCache(
projectPath = ProjectManagerImpl.getInstance().projectDirPath,
selectedFile = currentFile,
allFiles = it,
)
editorViewModel.writeOpenedFiles(cache)
editorViewModel.openedFilesCache = cache
}
Expand Down Expand Up @@ -285,7 +289,11 @@ open class EditorHandlerActivity :
}

val cache =
OpenedFilesCache(selectedFile = selectedFile.absolutePath, allFiles = openedFiles)
OpenedFilesCache(
projectPath = ProjectManagerImpl.getInstance().projectDirPath,
selectedFile = selectedFile.absolutePath,
allFiles = openedFiles,
)

val jsonCache = Gson().toJson(cache)
prefs.putString(PREF_KEY_OPEN_FILES_CACHE, jsonCache)
Expand Down Expand Up @@ -342,6 +350,12 @@ open class EditorHandlerActivity :
private fun onReadOpenedFilesCache(cache: OpenedFilesCache?) {
cache ?: return

val currentProjectPath = ProjectManagerImpl.getInstance().projectDirPath
if (cache.projectPath.isNotEmpty() && cache.projectPath != currentProjectPath) {
log.debug("[onStart] Discarding stale tab cache from project: {}", cache.projectPath)
return
}

lifecycleScope.launch(Dispatchers.IO) {
val existingFiles = cache.allFiles.filter { File(it.filePath).exists() }
val selectedFileExists = File(cache.selectedFile).exists()
Expand Down
22 changes: 13 additions & 9 deletions app/src/main/java/com/itsaky/androidide/models/OpenedFilesCache.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,15 @@ import java.io.Reader
/**
* @author Akash Yadav
*/
data class OpenedFilesCache(@SerializedName(KEY_SELECTED_FILE) val selectedFile: String,
@SerializedName(KEY_ALL_FILES) val allFiles: List<OpenedFile>) {
data class OpenedFilesCache(
@SerializedName(KEY_PROJECT_PATH) val projectPath: String = "",
@SerializedName(KEY_SELECTED_FILE) val selectedFile: String,
@SerializedName(KEY_ALL_FILES) val allFiles: List<OpenedFile>,
) {

companion object {

private const val KEY_PROJECT_PATH = "projectPath"
private const val KEY_SELECTED_FILE = "selectedFile"
private const val KEY_ALL_FILES = "allFiles"
private val log = LoggerFactory.getLogger(OpenedFilesCache::class.java)
Expand All @@ -45,20 +49,20 @@ data class OpenedFilesCache(@SerializedName(KEY_SELECTED_FILE) val selectedFile:
}

reader.beginObject()
var projectPath = ""
var selectedFile = ""
var allFiles = emptyList<OpenedFile>()
while (reader.hasNext()) {
val name = reader.nextName()

if (name == KEY_SELECTED_FILE) {
selectedFile = reader.nextString()
} else if (name == KEY_ALL_FILES) {
allFiles = Gson().fromJson(reader, object : TypeToken<List<OpenedFile>>() {})
when (reader.nextName()) {
KEY_PROJECT_PATH -> projectPath = reader.nextString()
KEY_SELECTED_FILE -> selectedFile = reader.nextString()
KEY_ALL_FILES -> allFiles = Gson().fromJson(reader, object : TypeToken<List<OpenedFile>>() {})
else -> reader.skipValue()
}
}
reader.endObject()

return@use OpenedFilesCache(selectedFile, allFiles)
return@use OpenedFilesCache(projectPath, selectedFile, allFiles)
}
} catch (err: Exception) {
log.error("Failed to parse opened files cache", err)
Expand Down