Fix implicit intent

shiftrot · Mar 7, 2023 · 1710eb3 · 1710eb3
1 parent 97fe6ba
commit 1710eb3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/term/src/main/java/jackpal/androidterm/RemoteInterface.java b/term/src/main/java/jackpal/androidterm/RemoteInterface.java
@@ -41,10 +41,8 @@
 import androidx.preference.PreferenceManager;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.UUID;
 
-import jackpal.androidterm.emulatorview.TermSession;
 import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompat;
 import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompatFactory;
 import jackpal.androidterm.util.SessionList;
@@ -428,7 +426,6 @@ public static String quoteForBash(String s) {
     }
 
     protected String openNewWindow(String iInitialCommand) {
-        TermService service = getTermService();
         Term.restoreSyncFileObserver(this);
 
         String initialCommand = getInitialCommand();
@@ -441,13 +438,8 @@ protected String openNewWindow(String iInitialCommand) {
         }
 
         try {
-            TermSession session = Term.createTermSession(this, mSettings, initialCommand);
-
-            session.setFinishCallback(service);
-            service.getSessions().add(session);
-
+            mInitialCommand = initialCommand;
             String handle = UUID.randomUUID().toString();
-            ((GenericTermSession) session).setHandle(handle);
 
             Intent intent = new Intent(PRIVACT_OPEN_NEW_WINDOW);
             intent.addCategory(Intent.CATEGORY_DEFAULT);
@@ -457,11 +449,19 @@ protected String openNewWindow(String iInitialCommand) {
             startActivity(intent);
 
             return handle;
-        } catch (IOException e) {
+        } catch (Exception e) {
             return null;
         }
     }
 
+    static private String mInitialCommand = null;
+    static public String getInitialCommand(String initialCommand) {
+        if (mInitialCommand == null) return initialCommand;
+        initialCommand = mInitialCommand;
+        mInitialCommand = null;
+        return initialCommand;
+    }
+
     private boolean mReplace = false;
 
     private String getInitialCommand() {

diff --git a/term/src/main/java/jackpal/androidterm/Term.java b/term/src/main/java/jackpal/androidterm/Term.java
@@ -1421,6 +1421,7 @@ private TermSession createTermSession() throws IOException {
     private String getInitialCommand() {
         String cmd = mSettings.getInitialCommand();
         cmd = mTermService.getInitialCommand(cmd, (mFirst && mTermService.getSessions().size() == 0));
+        cmd = RemoteInterface.getInitialCommand(cmd);
         boolean doInstall = TermVimInstaller.doInstallVim;
         if (FLAVOR_TERMINAL) {
             doInstall = !TermVimInstaller.getTermInstallStatus(this);