pos. fix #154

Author: DerGoogler

Android/app/src/main/java/com/dergoogler/plugin/TerminalPlugin.java

@@ -24,7 +24,7 @@ public class TerminalPlugin extends CordovaPlugin {
     private static final String LOG_TAG = "TerminalPlugin";
     private CallbackContext terminalCallbackContext = null;
 
-    private int ProcessCode = 1;
+    private int ProcessCode = 1000;
 
     @Override
     public boolean execute(String action, JSONArray data, CallbackContext callbackContext) throws JSONException {
@@ -33,17 +33,23 @@ public boolean execute(String action, JSONArray data, CallbackContext callbackCo
                 String cmd = data.getString(0);
                 JSONObject envp = data.getJSONObject(1);
                 String cwd = data.getString(2);
+                boolean printError = data.getBoolean(3);
 
                 this.terminalCallbackContext = callbackContext;
                 String[] commands = {"su", "-p", "-c", cmd};
 
+
                 cordova.getThreadPool().execute(() -> {
                     try {
-                        run(envp, cwd, commands);
-                        callbackContext.error(ProcessCode);
+                        if (run(envp, cwd, commands)) {
+                            callbackContext.error(ProcessCode);
+                        }
                     } catch (IOException | JSONException e) {
-                        callbackContext.error(500);
                         e.printStackTrace();
+                        if (printError) {
+                            updateTerminal(e.toString());
+                        }
+                        callbackContext.error(500);
                     }
                 });
                 return true;
@@ -58,7 +64,7 @@ public boolean execute(String action, JSONArray data, CallbackContext callbackCo
 
     }
 
-    public void run(JSONObject envp, String cwd, String... command) throws IOException, JSONException {
+    public boolean run(JSONObject envp, String cwd, String... command) throws IOException, JSONException {
         ProcessBuilder pb = new ProcessBuilder(command).redirectErrorStream(true);
         if (envp != null) {
             Map<String, String> m = pb.environment();
@@ -77,6 +83,8 @@ public void run(JSONObject envp, String cwd, String... command) throws IOExcepti
         } catch (Exception e) {
             ProcessCode = 500;
         }
+
+        return !process.isAlive();
     }
 
     private void updateTerminal(String line) {

Website/src/activitys/TerminalActivity.tsx

@@ -13,6 +13,8 @@ import { useModFS } from "@Hooks/useModFS";
 import { INCLUDE_CORE } from "@Util/INCLUDE_CORE";
 import { view } from "@Native/View";
 import { useConfirm } from "material-ui-confirm";
+import { ReplacementObject, useStrings } from "@Hooks/useStrings";
+import { StringDeclaration } from "./../locales/declaration";
 
 export interface TerminalActivityExtra {
   exploreInstall: boolean;
@@ -25,6 +27,7 @@ export interface TerminalActivityExtra {
 const TerminalActivity = () => {
   const { context, extra } = useActivity<TerminalActivityExtra>();
   const { settings } = useSettings();
+  const { strings } = useStrings();
   const { modFS, __modFS } = useModFS();
   const [active, setActive] = React.useState<bool>(true);
 
@@ -106,9 +109,10 @@ const TerminalActivity = () => {
   const rebootDevice = React.useCallback(() => {
     const reason = "";
     confirm({
-      title: "Reboot device?",
-      description: "Are you sure to reboot your device?",
-      confirmationText: "Yes",
+      title: strings("reboot_device"),
+      description: strings("reboot_device_desc"),
+      confirmationText: strings("yes"),
+      cancellationText: strings("cancel"),
     }).then(() => {
       Shell.cmd(`/system/bin/svc power reboot ${reason} || /system/bin/reboot ${reason}`).exec();
     });
@@ -211,8 +215,6 @@ const TerminalActivity = () => {
               setActive(false);
               break;
           }
-
-          addText({ children: String(code) });
         },
       });
     } else {
@@ -333,7 +335,7 @@ const TerminalActivity = () => {
           ))}
         </Stack>
       </div>
-      <div style={{ height: view.getWindowBottomInsets() }} ref={termEndRef} />
+      <div ref={termEndRef} />
     </Page>
   );
 };

Website/src/hooks/useStrings.tsx

@@ -4,7 +4,7 @@ import { SetValue, useNativeStorage } from "./useNativeStorage";
 import { StringDeclaration, Strs, useLanguageMap } from "./../locales/declaration";
 import { useSettings } from "./useSettings";
 
-type ReplacementObject = {
+export type ReplacementObject = {
   [key: string]: React.ReactNode;
 };
 

Website/src/locales/en.ts

@@ -147,4 +147,8 @@ export const en = {
   unverified_host_text:
     "You're accessing MMRL from {url} which isn't a verified host. Only use MMRL from it's origial source and not from thrid-party sources.",
   unverified_host_text_help: "Noticed any issues or you know that the accessed host safe for use is? Then report it under our {issues}",
+
+  // terminal activity
+  reboot_device: "Reboot device?",
+  reboot_device_desc: "Are you sure to reboot your device?",
 };

Website/src/typings/global.d.ts

@@ -98,8 +98,19 @@ declare global {
   namespace Terminal {
     export type Exec = {
       command: string;
+      /**
+       * Environment variables that should be used in your command execution
+       */
       env?: Record<string, string>;
+      /**
+       * Working directory
+       */
       cwd?: string;
+      /**
+       * Prints the error to the console or the `onLine` argument
+       * @default true
+       */
+      printError?: boolean;
       onLine: (line: string) => void;
       onExit: (code: number) => void;
     };

www/plugins/com.dergoogler.plugin/www/terminal.js

@@ -9,6 +9,7 @@ cordova.define(
           opt.command,
           opt.env || { HOME: "/" },
           opt.cwd || "/",
+          opt.printError || true,
         ]);
       },
       test: function (msg, successCallback, errorCallback) {