nix-community/nix-on-droid-app
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid-app.git synced 2025-11-08 19:46:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

TermuxFileReceiver: allow editor or url opener to be in local prefix ($HOME/.local)

Browse source
This commit is contained in:
Leonid Plyushch 2019-02-25 14:06:50 +02:00
parent 7b35f07c3d
commit 500b275662
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
View file

@ -26,7 +26,9 @@ public class TermuxFileReceiverActivity extends Activity {
static final String TERMUX_RECEIVEDIR = TermuxService.FILES_PATH + "/home/downloads"; static final String TERMUX_RECEIVEDIR = TermuxService.FILES_PATH + "/home/downloads";
static final String EDITOR_PROGRAM = TermuxService.HOME_PATH + "/bin/termux-file-editor"; static final String EDITOR_PROGRAM = TermuxService.HOME_PATH + "/bin/termux-file-editor";
static final String EDITOR_PROGRAM_ALT = TermuxService.HOME_PATH + "/.local/bin/termux-file-editor";
static final String URL_OPENER_PROGRAM = TermuxService.HOME_PATH + "/bin/termux-url-opener"; static final String URL_OPENER_PROGRAM = TermuxService.HOME_PATH + "/bin/termux-url-opener";
static final String URL_OPENER_PROGRAM_ALT = TermuxService.HOME_PATH + "/.local/bin/termux-url-opener";
/** /**
* If the activity should be finished when the name input dialog is dismissed. This is disabled * If the activity should be finished when the name input dialog is dismissed. This is disabled
@ -112,9 +114,14 @@ public class TermuxFileReceiverActivity extends Activity {
File outFile = saveStreamWithName(in, text); File outFile = saveStreamWithName(in, text);
if (outFile == null) return; if (outFile == null) return;
final File editorProgramFile = new File(EDITOR_PROGRAM); final File editorProgramFile;
if (!editorProgramFile.isFile()) {
showErrorDialogAndQuit("The following file does not exist:\n$HOME/bin/termux-file-editor\n\n" if (new File(EDITOR_PROGRAM).isFile()) {
editorProgramFile = new File(EDITOR_PROGRAM);
} else if (new File(EDITOR_PROGRAM_ALT).isFile()) {
editorProgramFile = new File(EDITOR_PROGRAM_ALT);
} else {
showErrorDialogAndQuit("The following file does not exist:\n$HOME/.local/bin/termux-file-editor\n\n"
+ "Create this file as a script or a symlink - it will be called with the received file as only argument."); + "Create this file as a script or a symlink - it will be called with the received file as only argument.");
return; return;
} }
@ -169,9 +176,14 @@ public class TermuxFileReceiverActivity extends Activity {
} }
void handleUrlAndFinish(final String url) { void handleUrlAndFinish(final String url) {
final File urlOpenerProgramFile = new File(URL_OPENER_PROGRAM); final File urlOpenerProgramFile;
if (!urlOpenerProgramFile.isFile()) {
showErrorDialogAndQuit("The following file does not exist:\n$HOME/bin/termux-url-opener\n\n" if (new File(URL_OPENER_PROGRAM).isFile()) {
urlOpenerProgramFile = new File(URL_OPENER_PROGRAM);
} else if (new File(URL_OPENER_PROGRAM_ALT).isFile()) {
urlOpenerProgramFile = new File(URL_OPENER_PROGRAM_ALT);
} else {
showErrorDialogAndQuit("The following file does not exist:\n$HOME/.local/bin/termux-url-opener\n\n"
+ "Create this file as a script or a symlink - it will be called with the shared URL as only argument."); + "Create this file as a script or a symlink - it will be called with the shared URL as only argument.");
return; return;
} }
@ -188,5 +200,4 @@ public class TermuxFileReceiverActivity extends Activity {
startService(executeIntent); startService(executeIntent);
finish(); finish();
} }
} }