1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 16:21:07 -08:00

Update Android port

* java/org/gnu/emacs/EmacsActivity.java (EmacsActivity):
* java/org/gnu/emacs/EmacsApplication.java (findDumpFile):
* java/org/gnu/emacs/EmacsContextMenu.java (EmacsContextMenu)
(addSubmenu, display):
* java/org/gnu/emacs/EmacsDocumentsProvider.java
(getNotificationUri, queryChildDocuments, deleteDocument):
* java/org/gnu/emacs/EmacsDrawRectangle.java (perform):
* java/org/gnu/emacs/EmacsFillRectangle.java (perform):
* java/org/gnu/emacs/EmacsOpenActivity.java (readEmacsClientLog)
(checkReadableOrCopy):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java
(EmacsSdk7FontDriver):
* java/org/gnu/emacs/EmacsSurfaceView.java (EmacsSurfaceView):
* java/org/gnu/emacs/EmacsView.java (EmacsView):
* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow, onKeyUp):
* java/org/gnu/emacs/EmacsWindowAttachmentManager.java
(EmacsWindowAttachmentManager): Remove various unused arguments
and variables, dead stores, and make minor cleanups and
performance improvements.
* src/androidmenu.c (FIND_METHOD_STATIC, android_menu_show):
Adjust accordingly.
This commit is contained in:
Po Lu 2023-06-16 12:59:44 +08:00
parent 7f0342a1bd
commit 377a3ebbb5
13 changed files with 73 additions and 60 deletions

View file

@ -131,9 +131,7 @@ public final class EmacsDocumentsProvider extends DocumentsProvider
getNotificationUri (File file)
{
Uri updatedUri;
Context context;
context = getContext ();
updatedUri
= buildChildDocumentsUri ("org.gnu.emacs",
file.getAbsolutePath ());
@ -294,6 +292,7 @@ public final class EmacsDocumentsProvider extends DocumentsProvider
{
MatrixCursor result;
File directory;
File[] files;
Context context;
if (projection == null)
@ -305,9 +304,15 @@ public final class EmacsDocumentsProvider extends DocumentsProvider
requested. */
directory = new File (parentDocumentId);
/* Now add each child. */
for (File child : directory.listFiles ())
queryDocument1 (result, child);
/* Look up each child. */
files = directory.listFiles ();
if (files != null)
{
/* Now add each child. */
for (File child : files)
queryDocument1 (result, child);
}
context = getContext ();
@ -406,12 +411,10 @@ public final class EmacsDocumentsProvider extends DocumentsProvider
{
File file, parent;
File[] children;
Context context;
/* Java makes recursively deleting a file hard. File name
encoding issues also prevent easily calling into C... */
context = getContext ();
file = new File (documentId);
parent = file.getParentFile ();