fix: notify all activities attachment state changed

Author: ozwaldorf

app/src/main/java/com/termux/app/TermuxActivity.java

@@ -370,9 +370,14 @@ public void onDestroy() {
                 mTermuxService.resetSessionClient(currentSession);
             }
             mTerminalView.detachSession();
+
+            // Notify other windows that session attachment state changed
+            mTermuxService.notifyAllSessionListsUpdated();
         }
 
         if (mTermuxService != null) {
+            // Remove this activity's client from the service's set
+            mTermuxService.removeTermuxTerminalSessionClient(mTermuxTerminalSessionActivityClient);
             mTermuxService = null;
         }
 

app/src/main/java/com/termux/app/TermuxService.java

@@ -50,7 +50,9 @@
 import com.termux.terminal.TerminalSessionClient;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * A service holding a list of {@link TermuxSession} in {@link TermuxShellManager#mTermuxSessions} and background {@link AppShell}
@@ -77,11 +79,12 @@ class LocalBinder extends Binder {
     private final Handler mHandler = new Handler();
 
 
-    /** The full implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
-     * that holds activity references for activity related functions.
-     * Note that the service may often outlive the activity, so need to clear this reference.
+    /** The full implementations of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
+     * that hold activity references for activity related functions. In multi-window mode, multiple
+     * activities may be bound simultaneously. Note that the service may often outlive the activities,
+     * so need to clear these references when activities are destroyed.
      */
-    private TermuxTerminalSessionActivityClient mTermuxTerminalSessionActivityClient;
+    private final Set<TermuxTerminalSessionActivityClient> mActivityClients = new HashSet<>();
 
     /** The basic implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession}
      * that does not hold activity references and only a service reference.
@@ -195,7 +198,7 @@ public boolean onUnbind(Intent intent) {
         // Since we cannot rely on {@link TermuxActivity.onDestroy()} to always complete,
         // we unset clients here as well if it failed, so that we do not leave service and session
         // clients with references to the activity.
-        if (mTermuxTerminalSessionActivityClient != null)
+        if (!mActivityClients.isEmpty())
             unsetTermuxTerminalSessionClient();
         return false;
     }
@@ -612,10 +615,8 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         if (executionCommand.isPluginExecutionCommand)
             mShellManager.mPendingPluginExecutionCommands.remove(executionCommand);
 
-        // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
-        // activity in is foreground
-        if (mTermuxTerminalSessionActivityClient != null)
-            mTermuxTerminalSessionActivityClient.termuxSessionListNotifyUpdated();
+        // Notify all activities that sessions list has been updated
+        notifyAllSessionListsUpdated();
 
         updateNotification();
 
@@ -649,10 +650,8 @@ public void onTermuxSessionExited(final TermuxSession termuxSession) {
 
             mShellManager.mTermuxSessions.remove(termuxSession);
 
-            // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
-            // activity in is foreground
-            if (mTermuxTerminalSessionActivityClient != null)
-                mTermuxTerminalSessionActivityClient.termuxSessionListNotifyUpdated();
+            // Notify all activities that sessions list has been updated
+            notifyAllSessionListsUpdated();
         }
 
         updateNotification();
@@ -687,8 +686,8 @@ private void handleSessionAction(int sessionAction, TerminalSession newTerminalS
         switch (sessionAction) {
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY:
                 setCurrentStoredTerminalSession(newTerminalSession);
-                if (mTermuxTerminalSessionActivityClient != null)
-                    mTermuxTerminalSessionActivityClient.setCurrentSession(newTerminalSession);
+                if (!mActivityClients.isEmpty())
+                    mActivityClients.iterator().next().setCurrentSession(newTerminalSession);
                 startTermuxActivity();
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY:
@@ -698,8 +697,8 @@ private void handleSessionAction(int sessionAction, TerminalSession newTerminalS
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_DONT_OPEN_ACTIVITY:
                 setCurrentStoredTerminalSession(newTerminalSession);
-                if (mTermuxTerminalSessionActivityClient != null)
-                    mTermuxTerminalSessionActivityClient.setCurrentSession(newTerminalSession);
+                if (!mActivityClients.isEmpty())
+                    mActivityClients.iterator().next().setCurrentSession(newTerminalSession);
                 break;
             case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY:
                 if (getTermuxSessionsSize() == 1)
@@ -731,40 +730,44 @@ private void startTermuxActivity() {
 
 
 
-    /** If {@link TermuxActivity} has not bound to the {@link TermuxService} yet or is destroyed, then
+    /** If no {@link TermuxActivity} has bound to the {@link TermuxService} yet or all are destroyed, then
      * interface functions requiring the activity should not be available to the terminal sessions,
      * so we just return the {@link #mTermuxTerminalSessionServiceClient}. Once {@link TermuxActivity} bind
-     * callback is received, it should call {@link #setTermuxTerminalSessionClient} to set the
-     * {@link TermuxService#mTermuxTerminalSessionActivityClient} so that further terminal sessions are directly
-     * passed the {@link TermuxTerminalSessionActivityClient} object which fully implements the
+     * callback is received, it should call {@link #setTermuxTerminalSessionClient} to add its client
+     * to {@link TermuxService#mActivityClients} so that further terminal sessions are directly
+     * passed a {@link TermuxTerminalSessionActivityClient} object which fully implements the
      * {@link TerminalSessionClient} interface.
      *
-     * @return Returns the {@link TermuxTerminalSessionActivityClient} if {@link TermuxActivity} has bound with
-     * {@link TermuxService}, otherwise {@link TermuxTerminalSessionServiceClient}.
+     * @return Returns the first available {@link TermuxTerminalSessionActivityClient} if any {@link TermuxActivity}
+     * has bound with {@link TermuxService}, otherwise {@link TermuxTerminalSessionServiceClient}.
      */
     public synchronized TermuxTerminalSessionClientBase getTermuxTerminalSessionClient() {
-        if (mTermuxTerminalSessionActivityClient != null)
-            return mTermuxTerminalSessionActivityClient;
+        if (!mActivityClients.isEmpty())
+            return mActivityClients.iterator().next();
         else
             return mTermuxTerminalSessionServiceClient;
     }
 
-    /** This should be called when {@link TermuxActivity#onServiceConnected} is called to set the
-     * {@link TermuxService#mTermuxTerminalSessionActivityClient} variable and update the {@link TerminalSession}
-     * and {@link TerminalEmulator} clients in case they were passed {@link TermuxTerminalSessionServiceClient}
-     * earlier.
+    /** This should be called when {@link TermuxActivity#onServiceConnected} is called to add
+     * the activity's client to {@link TermuxService#mActivityClients}. In multi-window mode,
+     * multiple activities may be bound simultaneously.
      *
      * @param termuxTerminalSessionActivityClient The {@link TermuxTerminalSessionActivityClient} object that fully
      * implements the {@link TerminalSessionClient} interface.
      */
     public synchronized void setTermuxTerminalSessionClient(TermuxTerminalSessionActivityClient termuxTerminalSessionActivityClient) {
-        mTermuxTerminalSessionActivityClient = termuxTerminalSessionActivityClient;
+        mActivityClients.add(termuxTerminalSessionActivityClient);
 
         // Don't update all sessions' clients here - in multi-window mode, each activity
         // should only set the client for its own attached session. The client is set
         // when setCurrentSession() is called in TermuxTerminalSessionActivityClient.
     }
 
+    /** Remove an activity client when its activity is destroyed. */
+    public synchronized void removeTermuxTerminalSessionClient(TermuxTerminalSessionActivityClient client) {
+        mActivityClients.remove(client);
+    }
+
     /** This should be called when {@link TermuxActivity} has been destroyed and in {@link #onUnbind(Intent)}
      * so that the {@link TermuxService} and {@link TerminalSession} and {@link TerminalEmulator}
      * clients do not hold an activity references.
@@ -773,7 +776,7 @@ public synchronized void unsetTermuxTerminalSessionClient() {
         for (int i = 0; i < mShellManager.mTermuxSessions.size(); i++)
             mShellManager.mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionServiceClient);
 
-        mTermuxTerminalSessionActivityClient = null;
+        mActivityClients.clear();
     }
 
     /** Reset a specific session's client to the service client. Used when an activity is destroyed
@@ -784,6 +787,14 @@ public synchronized void resetSessionClient(TerminalSession session) {
         }
     }
 
+    /** Notify all bound activities to update their session lists. Used when session attachment
+     * state changes in multi-window mode. */
+    public synchronized void notifyAllSessionListsUpdated() {
+        for (TermuxTerminalSessionActivityClient client : mActivityClients) {
+            client.termuxSessionListNotifyUpdated();
+        }
+    }
+
 
 
 

app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java

@@ -299,6 +299,12 @@ public void setCurrentSession(TerminalSession session) {
         if (mActivity.getTerminalView().attachSession(session)) {
             // notify about switched session if not already displaying the session
             notifyOfSessionChange();
+
+            // Notify all windows that session attachment state changed so they can update their lists
+            TermuxService service = mActivity.getTermuxService();
+            if (service != null) {
+                service.notifyAllSessionListsUpdated();
+            }
         }
 
         // Set this activity's client on the session so it receives callbacks (render updates, etc.)