Skip to content

Fix: terminal freezes when activity is destroyed while new instance already bound #5094

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
Frodotus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: terminal freezes when activity is destroyed while new instance already bound #5094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion app/src/main/java/com/termux/app/TermuxActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,9 @@ public void onDestroy() {

if (mTermuxService != null) {
// Do not leave service and session clients with references to activity.
mTermuxService.unsetTermuxTerminalSessionClient();
// Pass our own client so we don't clobber a newer activity's client if we are being
// destroyed while a new instance has already bound (e.g. after home-launcher restart).
mTermuxService.unsetTermuxTerminalSessionClient(mTermuxTerminalSessionActivityClient);
mTermuxService = null;
}

Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/com/termux/app/TermuxService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,13 @@ public synchronized void unsetTermuxTerminalSessionClient() {
mTermuxTerminalSessionActivityClient = null;
}

/** Only unsets the client if it matches {@code client}, so a newly bound activity's client is
* not clobbered by a previous activity's {@code onDestroy()}. */
public synchronized void unsetTermuxTerminalSessionClient(TermuxTerminalSessionActivityClient client) {
if (mTermuxTerminalSessionActivityClient == client)
unsetTermuxTerminalSessionClient();
}




Expand Down