Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@
"cordova-plugin-iap": {},
"com.foxdebug.acode.rk.customtabs": {},
"cordova-plugin-crashhandler": {},
"cordova-plugin-advanced-http": {
"ANDROIDBLACKLISTSECURESOCKETPROTOCOLS": "SSLv3,TLSv1"
},
"cordova-plugin-advanced-http": {},
"cordova-plugin-acode-webview": {},
"cordova-plugin-system": {}
},
Expand Down
1 change: 1 addition & 0 deletions src/components/terminal/terminal.js
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,7 @@ export default class TerminalComponent {
() => {},
console.error,
terminalValues.failsafeMode,
terminalValues.mergedHomeDirectories !== false,
);
}

Expand Down
1 change: 1 addition & 0 deletions src/components/terminal/terminalDefaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export const DEFAULT_TERMINAL_SETTINGS = {
confirmTabClose: true,
failsafeMode: false,
prootDebug: false,
mergedHomeDirectories: true,
// Touch selection settings
touchSelectionTapHoldDuration: 400,
touchSelectionMoveThreshold: 8,
Expand Down
12 changes: 11 additions & 1 deletion src/components/terminal/terminalManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ class TerminalManager {
`\x1b[31mError: ${cleanError}\x1b[0m\r\n`,
);
},
appSettings.value.terminalSettings?.mergedHomeDirectories !== false,
);

// Only return success if Terminal.install() indicates success (exit code 0)
Expand Down Expand Up @@ -1232,7 +1233,16 @@ class TerminalManager {

let convertedPath;

if (prootPath.startsWith("/public")) {
const mergedHomeDirectories =
appSettings.value.terminalSettings?.mergedHomeDirectories !== false;
const homePathMatch = mergedHomeDirectories
? prootPath.match(/^\/(home|root)(\/.*)?$/)
: null;
Comment on lines +1236 to +1240

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Postponed restarts break file paths

convertProotPath() uses the saved layout even when the user declines the restart. Start in separate mode, enable merging, and cancel the restart: the shell still uses the independent /home, but acode requests for /home/project now point to public/project. This opens the wrong location or fails to find the file.

Keep the running layout separate from the pending preference, and use the running layout when converting paths.

Knowledge Base Used: Settings domains and persistence


if (homePathMatch) {
// /home and /root are bind-mounted to the public directory.
convertedPath = `file://${dataDir}/files/public${homePathMatch[2] || ""}`;
} else if (prootPath.startsWith("/public")) {
// /public -> /data/user/0/com.foxdebug.acode/files/public
convertedPath = `file://${dataDir}/files${prootPath}`;
} else if (
Expand Down
7 changes: 6 additions & 1 deletion src/lang/ar-ye.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/az-az.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"plugin-review:error-max-length": "Rəy ən çox {max} simvoldan ibarət olmalıdır.",
"plugin-review:error-downvote-comment": "Nəyin yaxşılaşdırıla biləcəyini tərtibatçıya bildir.",
"plugin-review:error-empty": "Şərh əlavə et və ya «Bəyən» seçimini et.",
"plugin-review:unrated": "Qiymətləndirilməyib"
"plugin-review:unrated": "Qiymətləndirilməyib",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/be-by.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/bn-bd.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/cs-cz.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/de-de.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
5 changes: 5 additions & 0 deletions src/lang/en-us.json
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,11 @@
"terminal:convert eol": "Convert EOL",
"terminal:confirm tab close": "Confirm terminal tab close",
"terminal:image support": "Image support",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change.",
Comment on lines +481 to +485

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 New keys fail translation checks

The five new English keys are missing from every other language catalog. Changing en-us.json triggers the translation check, and lang check exits with an error for missing English keys. Add these keys to the other catalogs, using English text where translations are unavailable.

Knowledge Base Used: Appearance and language resources

"terminal": "Terminal",
"running processes": "Running processes",
"terminal not installed prompt": "Terminal is not installed. Would you like to initialize it now?",
Expand Down
7 changes: 6 additions & 1 deletion src/lang/es-sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Elige si las líneas ajustadas comienzan desde el borde izquierdo, mantienen la indentación de la línea original o se indentan más. Cada nivel extra usa el tamaño del tabulador.",
"icon pack": "Paquete de Íconos",
"settings-info-icon-pack": "Elige el paquete de iconos usado para archivos y carpetas en el explorador y listas de archivos en la aplicación.",
"unavailable": "no disponible"
"unavailable": "no disponible",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/fr-fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/he-il.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/hi-in.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/hu-hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Válassza ki, hogy a tördelt szövegek a képernyő bal szélétől kezdődjenek-e, az eredeti sor behúzását kövessék-e, vagy még jobban legyenek-e behúzva. Minden további behúzási szint a tabulátor méretét veszi alapul.",
"icon pack": "Ikoncsomag",
"settings-info-icon-pack": "Válassza ki a fájlokhoz és a mappákhoz használandó ikonokat a fájlkezelőben és az alkalmazás egészében megjelenő fájllistákban.",
"unavailable": "nem érhető el"
"unavailable": "nem érhető el",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/id-id.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Pilih apakah teks terbungkus dimulai dari tepi kiri, mengikuti indentasi baris asli, atau di-indentasi lebih jauh. Setiap level tambahan menggunakan ukuran tab Anda.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/ir-fa.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/it-it.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/ja-jp.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/ko-kr.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
7 changes: 6 additions & 1 deletion src/lang/ln-ln.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,5 +887,10 @@
"settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.",
"icon pack": "Icon pack",
"settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.",
"unavailable": "unavailable"
"unavailable": "unavailable",
"terminal:merged home directories": "Merged home directories",
"info-mergedHomeDirectories": "Mount /public as /home and /root inside the terminal. Disable to keep /public, /home and /root as separate directories; existing files stay where they are. Restarting the terminal is required for changes to take effect.",
"terminal:restart home layout": "Restart terminal",
"info-terminal-restart-home-layout": "Open terminal sessions will be closed so the new home directory layout can take effect.",
"terminal:restart required": "Restart the terminal to apply this change."
}
Loading
Loading