From 2451456695d0e03b89365cbbe64effb2f99af2d5 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Wed, 1 May 2024 11:45:53 +0800 Subject: Fix compatibility issues with Android clipboards * java/org/gnu/emacs/EmacsClipboard.java (getClipboardData): Return an AssetFileDescriptor. * java/org/gnu/emacs/EmacsContextMenu.java (onMenuItemClick): Typo corrections in commentary. * java/org/gnu/emacs/EmacsOpenActivity.java (onCreate): Raise minimum version on which to read file descriptors from ParcelFileDescriptor objects to Honeycomb. * java/org/gnu/emacs/EmacsSdk11Clipboard.java (getClipboardData): Return the asset file descriptor. * java/org/gnu/emacs/EmacsSdk8Clipboard.java (getClipboardData): Adjust return type to match. * src/android.h (struct android_parcel_file_descriptor_class): Move from androidselect.c. * src/androidselect.c (fd_class): Export function. (android_init_emacs_clipboard): Adjust signature of getClipboardData. (android_init_asset_file_descriptor, close_asset_fd) (extract_fd_offsets): New functions. (Fandroid_get_clipboard_data): Extract file descriptor and offset from the AssetFileDescriptor here, rather than in getClipboardData. (init_androidselect): Call android_init_asset_file_descriptor. * src/androidvfs.c (android_init_fd_class): Export and enable calling this function more than once. --- java/org/gnu/emacs/EmacsContextMenu.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/org/gnu/emacs/EmacsContextMenu.java') diff --git a/java/org/gnu/emacs/EmacsContextMenu.java b/java/org/gnu/emacs/EmacsContextMenu.java index 2bbf2a313d6..0f52d45455f 100644 --- a/java/org/gnu/emacs/EmacsContextMenu.java +++ b/java/org/gnu/emacs/EmacsContextMenu.java @@ -108,8 +108,8 @@ public final class EmacsContextMenu will normally confuse Emacs into thinking that the context menu has been dismissed. Wrong! - Setting this flag makes EmacsActivity to only handle - SubMenuBuilder being closed, which always means the menu + Setting this flag prompts EmacsActivity to only handle + SubMenuBuilders being closed, which always means the menu has actually been dismissed. However, these extraneous events aren't sent on devices -- cgit v1.3