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/EmacsOpenActivity.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'java/org/gnu/emacs/EmacsOpenActivity.java') diff --git a/java/org/gnu/emacs/EmacsOpenActivity.java b/java/org/gnu/emacs/EmacsOpenActivity.java index cdc68aea2bf..28e1e261821 100644 --- a/java/org/gnu/emacs/EmacsOpenActivity.java +++ b/java/org/gnu/emacs/EmacsOpenActivity.java @@ -70,11 +70,6 @@ public final class EmacsOpenActivity extends Activity { private static final String TAG = "EmacsOpenActivity"; - /* The name of any file that should be opened as EmacsThread starts - Emacs. This is never cleared, even if EmacsOpenActivity is - started a second time, as EmacsThread only starts once. */ - public static String fileToOpen; - /* Any currently focused EmacsOpenActivity. Used to show pop ups while the activity is active and Emacs doesn't have permission to display over other programs. */ @@ -697,9 +692,10 @@ public final class EmacsOpenActivity extends Activity if (EmacsService.SERVICE == null) { - fileToOpen = fileName; intent = new Intent (EmacsOpenActivity.this, EmacsActivity.class); + intent.putExtra (EmacsActivity.EXTRA_STARTUP_ARGUMENTS, + new String [] { fileName, }); finish (); startActivity (intent); return; -- cgit v1.3