Skip to content

ADFA-3030 | Prevent tab access crash when content is null #1023

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
jatezzz merged 5 commits into from
Mar 3, 2026
Merged

ADFA-3030 | Prevent tab access crash when content is null #1023

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae959a7
fix(editor): guard tab access when content is null
jatezzz Feb 26, 2026
5dd5c9b
fix(editor): prevent IllegalStateException by caching tabCount and co…
jatezzz Feb 26, 2026
d1c00ed
fix: add null safety and bounds checks for file tab creation
jatezzz Feb 27, 2026
53795e6
Merge branch 'stage' into fix/ADFA-3030-null-content-tab-access
jatezzz Mar 2, 2026
835d81a
Merge branch 'stage' into fix/ADFA-3030-null-content-tab-access
jatezzz Mar 3, 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
34 changes: 23 additions & 11 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 @@ -106,10 +106,13 @@ open class EditorHandlerActivity :
private val tabIndexToPluginId = mutableMapOf<Int, String>()

private fun getTabPositionForFileIndex(fileIndex: Int): Int {
val safeContent = contentOrNull ?: return -1
val totalTabs = safeContent.tabs.tabCount

if (fileIndex < 0) return -1
var tabPos = 0
var fileCount = 0
while (tabPos < content.tabs.tabCount) {
while (tabPos < totalTabs) {
if (!isPluginTab(tabPos)) {
if (fileCount == fileIndex) return tabPos
fileCount++
Expand Down Expand Up @@ -513,6 +516,8 @@ open class EditorHandlerActivity :
file: File,
selection: Range?,
): Int {
val safeContent = contentOrNull ?: return -1
val totalTabs = safeContent.tabs.tabCount
val openedFileIndex = findIndexOfEditorByFile(file)
if (openedFileIndex != -1) {
return openedFileIndex
Expand All @@ -524,18 +529,19 @@ open class EditorHandlerActivity :

val fileIndex = editorViewModel.getOpenedFileCount()
val tabPosition = getNextFileTabPosition()
if (tabPosition < 0) return -1

log.info("Opening file at file index {} tab position {} file:{}", fileIndex, tabPosition, file)

val editor = CodeEditorView(this, file, selection!!)
editor.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)

if (tabPosition >= content.tabs.tabCount) {
content.tabs.addTab(content.tabs.newTab())
content.editorContainer.addView(editor)
if (tabPosition >= totalTabs) {
safeContent.tabs.addTab(safeContent.tabs.newTab())
safeContent.editorContainer.addView(editor)
} else {
content.tabs.addTab(content.tabs.newTab(), tabPosition)
content.editorContainer.addView(editor, tabPosition)
safeContent.tabs.addTab(safeContent.tabs.newTab(), tabPosition)
safeContent.editorContainer.addView(editor, tabPosition)
shiftPluginIndices(tabPosition, 1)
}

Expand All @@ -548,8 +554,11 @@ open class EditorHandlerActivity :
}

private fun getNextFileTabPosition(): Int {
val safeContent = contentOrNull ?: return -1
val totalTabs = safeContent.tabs.tabCount

var lastFileTabPos = -1
for (i in 0 until content.tabs.tabCount) {
for (i in 0 until totalTabs) {
if (!isPluginTab(i)) {
lastFileTabPos = i
}
Expand Down Expand Up @@ -1163,11 +1172,13 @@ open class EditorHandlerActivity :
}

fun isPluginTab(position: Int): Boolean {
if (position < 0 || position >= content.tabs.tabCount) {
val safeContent = contentOrNull ?: return false
val totalTabs = safeContent.tabs.tabCount

if (position !in 0..<totalTabs) {
return false
}
val result = tabIndexToPluginId.containsKey(position)
return result
return tabIndexToPluginId.containsKey(position)
}

fun getPluginTabId(position: Int): String? = tabIndexToPluginId[position]
Expand All @@ -1179,10 +1190,11 @@ open class EditorHandlerActivity :
}

fun updateTabVisibility() {
val safeContent = contentOrNull ?: return
val hasFiles = editorViewModel.getOpenedFileCount() > 0
val hasPluginTabs = pluginTabIndices.isNotEmpty()

content.apply {
safeContent.apply {
if (!hasFiles && !hasPluginTabs) {
tabs.visibility = View.GONE
viewContainer.displayedChild = 1
Expand Down