procyberian/emacs
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Prevent crashes and related issues if initial activity is destroyed on Android

Browse source 
* java/org/gnu/emacs/EmacsWindow.java
(EmacsWindow) <initialWindowCreated>: New variable.
(EmacsWindow): If the initial frame has not yet been created,
set attachmentToken to -1.

* java/org/gnu/emacs/EmacsWindowManager.java (registerWindow):
When the window's attachment token is -1 (i.e., it is the
default window), start EmacsActivity rather than
EmacsMultitaskActivity.  Catch exceptions around startActivity.
This commit is contained in:
Po Lu 2024-06-27 11:06:59 +08:00
parent d5c6eb1f96
commit 860840621a
2 changed files with 47 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
java/org/gnu/emacs/EmacsWindow.java
View file

@ -74,6 +74,9 @@ public final class EmacsWindow extends EmacsHandleObject
{
private static final String TAG = "EmacsWindow";
/* Whether any windows have yet been created in this session. */
private static boolean initialWindowCreated;
private static class Coordinate
{
/* Integral coordinate. */
@ -192,6 +195,14 @@ public final class EmacsWindow extends EmacsHandleObject
this.parent = parent;
this.overrideRedirect = overrideRedirect;
/* The initial frame should always be bound to the startup
activity. */
if (!initialWindowCreated)
{
this.attachmentToken = -1;
initialWindowCreated = true;
}
/* Create the list of children. */
children = new ArrayList<EmacsWindow> ();

43
java/org/gnu/emacs/EmacsWindowManager.java
View file

@ -174,6 +174,27 @@ public final class EmacsWindowManager
}
}
/* Do not create a multitasking activity for the initial frame,
but arrange to start EmacsActivity. */
if (window.attachmentToken == -1)
{
intent = new Intent (EmacsService.SERVICE,
EmacsActivity.class);
intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK);
try
{
EmacsService.SERVICE.startActivity (intent);
}
catch (Exception e)
{
Log.w (TAG, "an activity could not be started on behalf"
+ " of the mapped default window " + window.handle);
}
return;
}
intent = new Intent (EmacsService.SERVICE,
EmacsMultitaskActivity.class);
@ -205,14 +226,22 @@ public final class EmacsWindowManager
window.attachmentToken = token;
intent.putExtra (ACTIVITY_TOKEN, token);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
EmacsService.SERVICE.startActivity (intent);
else
try
{
/* Specify the desired window size. */
options = ActivityOptions.makeBasic ();
options.setLaunchBounds (window.getGeometry ());
EmacsService.SERVICE.startActivity (intent, options.toBundle ());
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
EmacsService.SERVICE.startActivity (intent);
else
{
/* Specify the desired window size. */
options = ActivityOptions.makeBasic ();
options.setLaunchBounds (window.getGeometry ());
EmacsService.SERVICE.startActivity (intent, options.toBundle ());
}
}
catch (Exception e)
{
Log.w (TAG, "an activity could not be started on behalf"
+ " of a mapped window, " + window.handle);
}
pruneWindows ();