From 41dd78cd362a80f1becc006a37f163119b93df10 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sat, 4 May 2024 16:06:00 +0800 Subject: Simplify handling of command-line arguments on Android * java/org/gnu/emacs/EmacsActivity.java (EXTRA_STARTUP_ARGUMENTS): New constant. (onCreate): Read a string array, not a string extra from the intent with this key. * java/org/gnu/emacs/EmacsOpenActivity.java (EmacsOpenActivity) : Delete field. (onCreate): Provide file name as a command line argument when starting the Emacs service. * java/org/gnu/emacs/EmacsPreferencesActivity.java (startEmacsQ) (startEmacsDebugInit): In like manner, replace ad-hoc command-line argument extra with a proper array. * java/org/gnu/emacs/EmacsService.java (EmacsService): Rename extraStartupArgument to extraStartupArguments, and change its type to a string array. (onCreate): Adjust to match. * java/org/gnu/emacs/EmacsThread.java (EmacsThread) : Ditto. : Delete field. (run): Adjust correspondingly. --- java/org/gnu/emacs/EmacsPreferencesActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'java/org/gnu/emacs/EmacsPreferencesActivity.java') diff --git a/java/org/gnu/emacs/EmacsPreferencesActivity.java b/java/org/gnu/emacs/EmacsPreferencesActivity.java index 766e2e11d46..a3edd6388b4 100644 --- a/java/org/gnu/emacs/EmacsPreferencesActivity.java +++ b/java/org/gnu/emacs/EmacsPreferencesActivity.java @@ -57,7 +57,8 @@ public class EmacsPreferencesActivity extends PreferenceActivity intent = new Intent (this, EmacsActivity.class); intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - intent.putExtra ("org.gnu.emacs.STARTUP_ARGUMENT", "--quick"); + intent.putExtra (EmacsActivity.EXTRA_STARTUP_ARGUMENTS, + new String[] {"--quick", }); startActivity (intent); System.exit (0); } @@ -74,7 +75,8 @@ public class EmacsPreferencesActivity extends PreferenceActivity intent = new Intent (this, EmacsActivity.class); intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - intent.putExtra ("org.gnu.emacs.STARTUP_ARGUMENT", "--debug-init"); + intent.putExtra (EmacsActivity.EXTRA_STARTUP_ARGUMENTS, + new String[] {"--debug-init", }); startActivity (intent); System.exit (0); } -- cgit v1.3