fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 10:45:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed!: Do not wait for the user to press enter for failed terminal session commands if plugin expects the result back

Browse Source
This commit is contained in:
agnostic-apollo
2021-09-09 07:25:22 +05:00
parent 9ffcd21ce1
commit c19e01fc1b
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java
View File

@@ -138,24 +138,36 @@ public class TermuxTerminalSessionClient extends TermuxTerminalSessionClientBase
return; return;
} }
int index = service.getIndexOfSession(finishedSession);
// For plugin commands that expect the result back, we should immediately close the session
// and send the result back instead of waiting fo the user to press enter.
// The plugin can handle/show errors itself.
boolean isPluginExecutionCommandWithPendingResult = false;
TermuxSession termuxSession = service.getTermuxSession(index);
if (termuxSession != null) {
isPluginExecutionCommandWithPendingResult = termuxSession.getExecutionCommand().isPluginExecutionCommandWithPendingResult();
if (isPluginExecutionCommandWithPendingResult)
Logger.logVerbose(LOG_TAG, "The \"" + finishedSession.mSessionName + "\" session will be force finished automatically since result in pending.");
}
if (mActivity.isVisible() && finishedSession != mActivity.getCurrentSession()) { if (mActivity.isVisible() && finishedSession != mActivity.getCurrentSession()) {
// Show toast for non-current sessions that exit. // Show toast for non-current sessions that exit.
int indexOfSession = service.getIndexOfSession(finishedSession);
// Verify that session was not removed before we got told about it finishing: // Verify that session was not removed before we got told about it finishing:
if (indexOfSession >= 0) if (index >= 0)
mActivity.showToast(toToastTitle(finishedSession) + " - exited", true); mActivity.showToast(toToastTitle(finishedSession) + " - exited", true);
} }
if (mActivity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)) { if (mActivity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
// On Android TV devices we need to use older behaviour because we may // On Android TV devices we need to use older behaviour because we may
// not be able to have multiple launcher icons. // not be able to have multiple launcher icons.
if (service.getTermuxSessionsSize() > 1) { if (service.getTermuxSessionsSize() > 1 || isPluginExecutionCommandWithPendingResult) {
removeFinishedSession(finishedSession); removeFinishedSession(finishedSession);
} }
} else { } else {
// Once we have a separate launcher icon for the failsafe session, it // Once we have a separate launcher icon for the failsafe session, it
// should be safe to auto-close session on exit code '0' or '130'. // should be safe to auto-close session on exit code '0' or '130'.
if (finishedSession.getExitStatus() == 0 || finishedSession.getExitStatus() == 130) { if (finishedSession.getExitStatus() == 0 || finishedSession.getExitStatus() == 130 || isPluginExecutionCommandWithPendingResult) {
removeFinishedSession(finishedSession); removeFinishedSession(finishedSession);
} }
} }