mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-03 06:00:50 -08:00
Code Issues Projects Releases Wiki Activity

Simplify handling of command-line arguments on Android

Browse source 
* 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)
<fileToOpen>: 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)
<extraStartupArguments>: Ditto.
<fileToOpen>: Delete field.
(run): Adjust correspondingly.
This commit is contained in:
Po Lu 2024-05-04 16:06:00 +08:00
parent ecfbd0ff99
commit 41dd78cd36
5 changed files with 32 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
java/org/gnu/emacs/EmacsActivity.java
View file

@ -55,6 +55,9 @@ public class EmacsActivity extends Activity
{
public static final String TAG = "EmacsActivity";
/* Key of intent value providing extra startup argument. */
public static final String EXTRA_STARTUP_ARGUMENTS;
/* ID for URIs from a granted document tree. */
public static final int ACCEPT_DOCUMENT_TREE = 1;
@ -88,6 +91,7 @@ public class EmacsActivity extends Activity
static
{
focusedActivities = new ArrayList<EmacsActivity> ();
EXTRA_STARTUP_ARGUMENTS = "org.gnu.emacs.STARTUP_ARGUMENTS";
};
public static void
@ -242,8 +246,8 @@ public class EmacsActivity extends Activity
/* See if Emacs should be started with any extra arguments, such
as `--quick'. */
intent = getIntent ();
EmacsService.extraStartupArgument
= intent.getStringExtra ("org.gnu.emacs.STARTUP_ARGUMENT");
EmacsService.extraStartupArguments
= intent.getStringArrayExtra (EXTRA_STARTUP_ARGUMENTS);
matchParent = FrameLayout.LayoutParams.MATCH_PARENT;
params