Fix foreground service

shiftrot · Mar 7, 2023 · 490a30a · 490a30a
1 parent 1710eb3
commit 490a30a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/term/src/main/AndroidManifest.xml b/term/src/main/AndroidManifest.xml
@@ -19,7 +19,8 @@
         android:maxSdkVersion="32"
         tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_TYPE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_TYPE_DATA_SYNC"/>
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission

diff --git a/term/src/main/java/jackpal/androidterm/RemoteInterface.java b/term/src/main/java/jackpal/androidterm/RemoteInterface.java
@@ -41,8 +41,10 @@
 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;
@@ -426,6 +428,7 @@ public static String quoteForBash(String s) {
     }
 
     protected String openNewWindow(String iInitialCommand) {
+        TermService service = getTermService();
         Term.restoreSyncFileObserver(this);
 
         String initialCommand = getInitialCommand();
@@ -438,8 +441,13 @@ protected String openNewWindow(String iInitialCommand) {
         }
 
         try {
-            mInitialCommand = initialCommand;
+            TermSession session = Term.createTermSession(this, mSettings, initialCommand);
+
+            session.setFinishCallback(service);
+            service.getSessions().add(session);
+
             String handle = UUID.randomUUID().toString();
+            ((GenericTermSession) session).setHandle(handle);
 
             Intent intent = new Intent(PRIVACT_OPEN_NEW_WINDOW);
             intent.addCategory(Intent.CATEGORY_DEFAULT);
@@ -449,19 +457,11 @@ protected String openNewWindow(String iInitialCommand) {
             startActivity(intent);
 
             return handle;
-        } catch (Exception e) {
+        } catch (IOException 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,7 +1421,6 @@ 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);