Skip to content

fix: deliver Termux RUN_COMMAND results via pending intent #80

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
Zhou-Shilin merged 2 commits into from
Sep 24, 2026
Merged

fix: deliver Termux RUN_COMMAND results via pending intent #80

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
b2ad0e7
fix: deliver Termux RUN_COMMAND results via pending intent
Chumor Sep 19, 2026
b2e81d5
fix: start Termux RunCommandService with Context.startForegroundService
Chumor Sep 19, 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
16 changes: 13 additions & 3 deletions app/src/main/java/com/zhousl/aether/termux/TermuxBashTool.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,13 +608,14 @@ class TermuxBashTool(
): String {
val executionId = TermuxPendingResults.nextExecutionId()
val deferred = TermuxPendingResults.register(executionId)
val resultIntent = Intent(context, TermuxResultReceiver::class.java)
val appContext = context.applicationContext
val resultIntent = Intent(appContext, TermuxResultReceiver::class.java)
.putExtra(TermuxContract.ExecutionIdExtra, executionId)
val flags = PendingIntent.FLAG_ONE_SHOT or
PendingIntent.FLAG_UPDATE_CURRENT or
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0
val pendingIntent = PendingIntent.getBroadcast(
context,
appContext,
executionId,
resultIntent,
flags,
Expand Down Expand Up @@ -643,7 +644,7 @@ class TermuxBashTool(
}

return try {
val startResult = context.startService(request)
val startResult = startTermuxRunCommandService(request)
if (startResult == null) {
TermuxPendingResults.remove(executionId)
logTermux(
Expand Down Expand Up @@ -709,6 +710,15 @@ class TermuxBashTool(
}
}

private fun startTermuxRunCommandService(request: Intent): ComponentName? {
return try {
context.startForegroundService(request)
} catch (throwable: Throwable) {
logTermux("foreground service start failed message=${throwable.message.orEmpty()}")
context.startService(request)
}
}

@Suppress("DEPRECATION")
private fun isTermuxInstalled(): Boolean = runCatching {
context.packageManager.getPackageInfo(TermuxContract.PackageName, 0)
Expand Down
29 changes: 17 additions & 12 deletions app/src/main/java/com/zhousl/aether/termux/TermuxResultReceiver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,26 @@ class TermuxResultReceiver : BroadcastReceiver() {
context: Context,
intent: Intent,
) {
val executionId = intent.getIntExtra(TermuxContract.ExecutionIdExtra, -1)
if (executionId < 0) return
val pendingResult = goAsync()
try {
val executionId = intent.getIntExtra(TermuxContract.ExecutionIdExtra, -1)
if (executionId < 0) return

val resultBundle = intent.extras?.getBundle(TermuxContract.ResultBundleExtra)
?: intent.extras?.findFirstBundle()
val resultBundle = intent.extras?.getBundle(TermuxContract.ResultBundleExtra)
?: intent.extras?.findFirstBundle()

val result = TermuxCommandResult(
stdout = resultBundle?.getString(TermuxContract.ResultStdoutExtra).orEmpty(),
stderr = resultBundle?.getString(TermuxContract.ResultStderrExtra).orEmpty(),
exitCode = resultBundle?.getInt(TermuxContract.ResultExitCodeExtra, -1) ?: -1,
err = resultBundle?.getInt(TermuxContract.ResultErrExtra, -1) ?: -1,
errmsg = resultBundle?.getString(TermuxContract.ResultErrmsgExtra).orEmpty(),
)
val result = TermuxCommandResult(
stdout = resultBundle?.getString(TermuxContract.ResultStdoutExtra).orEmpty(),
stderr = resultBundle?.getString(TermuxContract.ResultStderrExtra).orEmpty(),
exitCode = resultBundle?.getInt(TermuxContract.ResultExitCodeExtra, -1) ?: -1,
err = resultBundle?.getInt(TermuxContract.ResultErrExtra, -1) ?: -1,
errmsg = resultBundle?.getString(TermuxContract.ResultErrmsgExtra).orEmpty(),
)

TermuxPendingResults.complete(executionId, result)
TermuxPendingResults.complete(executionId, result)
} finally {
pendingResult.finish()
}
}
}

Expand Down
Loading