0eb1f4e571
* doc/emacs/android.texi (Android Troubleshooting): Document `debug-init' option. * java/AndroidManifest.xml.in (EmacsLauncherPreferencesActivity): New activity. Export on systems older than Android 7.0. * java/org/gnu/emacs/EmacsActivity.java (onCreate): Adjust for string startup argument. * java/org/gnu/emacs/EmacsLauncherPreferencesActivity.java: New file. * java/org/gnu/emacs/EmacsPreferencesActivity.java (EmacsPreferencesActivity): Don't make final. (startEmacsQ): Give start-up argument as an argument, not as a boolean. (startEmacsDebugInit): New function. (onCreate): Register new listener; make final. * java/org/gnu/emacs/EmacsService.java (onCreate): Pass extraStartupArgument. * java/org/gnu/emacs/EmacsThread.java (EmacsThread): Rename startDashQ to extraStartupArgument. (run): Adjust accordingly. * java/res/values-v24/bool.xml: * java/res/values/bool.xml: * java/res/values/strings.xml: New files. * java/res/xml/preferences.xml: Add new option. Move string resources around.
84 lines
2.3 KiB
Java
84 lines
2.3 KiB
Java
/* Communication module for Android terminals. -*- c-file-style: "GNU" -*-
|
|
|
|
Copyright (C) 2023 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
GNU Emacs is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or (at
|
|
your option) any later version.
|
|
|
|
GNU Emacs is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
package org.gnu.emacs;
|
|
|
|
import java.lang.Thread;
|
|
import java.util.Arrays;
|
|
|
|
import android.os.Build;
|
|
import android.util.Log;
|
|
|
|
public class EmacsThread extends Thread
|
|
{
|
|
private static final String TAG = "EmacsThread";
|
|
|
|
/* Whether or not Emacs should be started with an additional
|
|
argument, and that additional argument if non-NULL. */
|
|
private String extraStartupArgument;
|
|
|
|
/* Runnable run to initialize Emacs. */
|
|
private Runnable paramsClosure;
|
|
|
|
/* Whether or not to open a file after starting Emacs. */
|
|
private String fileToOpen;
|
|
|
|
public
|
|
EmacsThread (EmacsService service, Runnable paramsClosure,
|
|
String extraStartupArgument, String fileToOpen)
|
|
{
|
|
super ("Emacs main thread");
|
|
this.extraStartupArgument = extraStartupArgument;
|
|
this.paramsClosure = paramsClosure;
|
|
this.fileToOpen = fileToOpen;
|
|
}
|
|
|
|
@Override
|
|
public void
|
|
run ()
|
|
{
|
|
String args[];
|
|
|
|
if (fileToOpen == null)
|
|
{
|
|
if (extraStartupArgument == null)
|
|
args = new String[] { "libandroid-emacs.so", };
|
|
else
|
|
args = new String[] { "libandroid-emacs.so",
|
|
extraStartupArgument, };
|
|
}
|
|
else
|
|
{
|
|
if (extraStartupArgument != null)
|
|
args = new String[] { "libandroid-emacs.so",
|
|
fileToOpen, };
|
|
else
|
|
args = new String[] { "libandroid-emacs.so",
|
|
extraStartupArgument,
|
|
fileToOpen, };
|
|
}
|
|
|
|
paramsClosure.run ();
|
|
|
|
/* Run the native code now. */
|
|
Log.d (TAG, "run: " + Arrays.toString (args));
|
|
EmacsNative.initEmacs (args, EmacsApplication.dumpFileName,
|
|
Build.VERSION.SDK_INT);
|
|
}
|
|
};
|