Skip to content

ADFA-3467 | Fix IllegalStateException caused by missing IDEDebugClientImpl instance #1473

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

Open
jatezzz wants to merge 2 commits into
base: stage
Choose a base branch
from
Open

ADFA-3467 | Fix IllegalStateException caused by missing IDEDebugClientImpl instance #1473

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
69bc91a
fix(debug): handle nullable IDEDebugClientImpl to prevent IllegalStat…
jatezzz Jul 3, 2026
0f94da1
Merge branch 'stage' into fix/ADFA-3467-debug-client-illegal-state-ex…
jatezzz Jul 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
8 changes: 4 additions & 4 deletions app/src/main/java/com/itsaky/androidide/actions/debug/AbstractDebuggerAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ abstract class AbstractDebuggerAction(
override var enabled = true
override var icon: Drawable? = null

protected val debugClient: IDEDebugClientImpl
get() = IDEDebugClientImpl.requireInstance()
protected val debugClient: IDEDebugClientImpl?
get() = IDEDebugClientImpl.getInstance()

protected open fun checkEnabled(data: ActionData): Boolean = debugClient.isVmConnected()
protected open fun checkEnabled(data: ActionData): Boolean = debugClient?.isVmConnected() == true

override fun prepare(data: ActionData) {
super.prepare(data)

icon = ContextCompat.getDrawable(data.requireContext(), iconRes)
enabled = checkEnabled(data)
}
}
}
8 changes: 5 additions & 3 deletions app/src/main/java/com/itsaky/androidide/actions/debug/AbstractStepAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ abstract class AbstractStepAction(
@DrawableRes iconRes: Int
): AbstractDebuggerAction(iconRes) {

override fun checkEnabled(data: ActionData): Boolean =
debugClient.connectionState >= DebuggerConnectionState.AWAITING_BREAKPOINT
}
override fun checkEnabled(data: ActionData): Boolean {
val client = debugClient ?: return false
return client.connectionState >= DebuggerConnectionState.AWAITING_BREAKPOINT
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/com/itsaky/androidide/actions/debug/KillVmAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ class KillVmAction(
override var tooltipTag = TooltipTag.DEBUGGER_ACTION_KILL

override suspend fun execAction(data: ActionData) {
debugClient.killVm()
debugClient?.killVm()
}
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/com/itsaky/androidide/actions/debug/StepIntoAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ class StepIntoAction(
override var tooltipTag = TooltipTag.DEBUGGER_ACTION_STEP_INTO

override suspend fun execAction(data: ActionData) {
debugClient.stepInto()
debugClient?.stepInto()
}
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/com/itsaky/androidide/actions/debug/StepOutAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ class StepOutAction(
override var tooltipTag = TooltipTag.DEBUGGER_ACTION_STEP_OUT

override suspend fun execAction(data: ActionData) {
debugClient.stepOut()
debugClient?.stepOut()
}
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/com/itsaky/androidide/actions/debug/StepOverAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ class StepOverAction(
override var tooltipTag = TooltipTag.DEBUGGER_ACTION_STEP_OVER

override suspend fun execAction(data: ActionData) {
debugClient.stepOver()
debugClient?.stepOver()
}
}
}
11 changes: 6 additions & 5 deletions app/src/main/java/com/itsaky/androidide/actions/debug/SuspendResumeVmAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class SuspendResumeVmAction(
override fun prepare(data: ActionData) {
super.prepare(data)
val context = data.requireContext()
val isSuspended = debugClient.isVmSuspended()
val isSuspended = debugClient?.isVmSuspended() == true
if (isSuspended) {
label = context.getString(R.string.debugger_resume)
icon = ContextCompat.getDrawable(context, R.drawable.ic_run)
Expand All @@ -33,10 +33,11 @@ class SuspendResumeVmAction(
}

override suspend fun execAction(data: ActionData) {
if (debugClient.isVmSuspended()) {
debugClient.resumeVm()
val client = debugClient ?: return
if (client.isVmSuspended()) {
client.resumeVm()
} else {
debugClient.suspendVm()
client.suspendVm()
}
}
}
}
Loading