Skip to content

Commit 4365ca5

Browse files
committed
Some other fixes
1 parent b13d6af commit 4365ca5

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public boolean execute(String action, JSONArray data, CallbackContext callbackCo
3030
JSONObject envp = data.getJSONObject(1);
3131

3232
this.terminalCallbackContext = callbackContext;
33-
String[] commands = {"su", "-p" +
34-
"", "-c", cmd};
33+
String[] commands = {"su", "-p", "-c", cmd};
3534

3635
cordova.getThreadPool().execute(() -> {
3736
try {

Website/src/components/ConfigureView/libs.ts

+24-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ import { SuFile } from "@Native/SuFile";
1515
import { StringsProvider, useStrings } from "@Hooks/useStrings";
1616
import { Shell } from "@Native/Shell";
1717
import Ansi from "ansi-to-react";
18+
import { os } from "@Native/Os";
19+
import { BuildConfig } from "@Native/BuildConfig";
20+
import { useSettings } from "@Hooks/useSettings";
1821

1922
export const libraries = [
2023
{
@@ -35,7 +38,7 @@ export const libraries = [
3538
},
3639
{
3740
name: "@mmrl/terminal",
38-
__esModule: Terminal,
41+
__esModule: os.isAndroid ? Terminal : {},
3942
},
4043
{
4144
name: "@mmrl/ui",
@@ -59,6 +62,7 @@ export const libraries = [
5962
useNativeProperties: useNativeProperties,
6063
useNativeStorage: useNativeStorage,
6164
useTheme: useTheme,
65+
useSettings: useSettings,
6266
useStrings: useStrings,
6367
},
6468
},
@@ -93,6 +97,24 @@ export const libraries = [
9397
pw_name: Shell.pw_name,
9498
},
9599
},
100+
{
101+
name: "@mmrl/os",
102+
__esModule: {
103+
toast: os.toast,
104+
sdk: os.sdk,
105+
},
106+
},
107+
{
108+
name: "@mmrl/buildconfig",
109+
__esModule: {
110+
BUILD_DATE: BuildConfig.BUILD_DATE,
111+
VERSION_NAME: BuildConfig.VERSION_NAME,
112+
VERSION_CODE: BuildConfig.VERSION_CODE,
113+
APPLICATION_ID: BuildConfig.APPLICATION_ID,
114+
DEBUG: BuildConfig.DEBUG,
115+
BUILD_TYPE: BuildConfig.BUILD_TYPE,
116+
},
117+
},
96118
];
97119

98120
const prototypeWhitelist = Sandbox.SAFE_PROTOTYPES;
@@ -103,5 +125,6 @@ export const globals = {
103125
JSON: JSON,
104126
YAML: require("yaml"),
105127
INI: require("ini"),
128+
Toast: Toast,
106129
Object,
107130
};

0 commit comments

Comments
 (0)