Respect file display names during Android drag-and-drop

* java/org/gnu/emacs/EmacsService.java (buildContentName):
Remove redundant projection argument to resolver.query.

* java/org/gnu/emacs/EmacsWindow.java (onDragEvent): If a
content resolver is available, attempt to convert content URIs
into file names in advance.

* lisp/term/android-win.el (android-handle-dnd-event): Adjust
correspondingly.

(cherry picked from commit e72f17e4622fae45c9814f6ed196e5a9ed06cdd2)

diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 19aa3dee4564af21aed0416ca4e2293d488ecf15..785163c713c0cd48eadb86e55b354f87fce90b3b 100644 (file)
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -1072,7 +1072,6 @@ public final class EmacsService extends Service
   {
     StringBuilder builder;
     String displayName;
-    String[] projection;
     Cursor cursor;
     int column;
 
@@ -1081,8 +1080,7 @@ public final class EmacsService extends Service
 
     try
       {
-       projection = new String[] { OpenableColumns.DISPLAY_NAME, };
-       cursor = resolver.query (uri, projection, null, null, null);
+       cursor = resolver.query (uri, null, null, null, null);
 
        if (cursor != null)
          {

diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java
index dbb3a23d98eafe5c6beb4322f5fb08f59a8b6f2c..d81d4106170936341a9afdd78a8f309ad7ed2fbd 100644 (file)
--- a/java/org/gnu/emacs/EmacsWindow.java
+++ b/java/org/gnu/emacs/EmacsWindow.java
@@ -31,6 +31,7 @@ import android.app.Activity;
 
 import android.content.ClipData;
 import android.content.ClipDescription;
+import android.content.ContentResolver;
 import android.content.Context;
 
 import android.graphics.Rect;
@@ -1699,10 +1700,11 @@ public final class EmacsWindow extends EmacsHandleObject
     ClipData data;
     ClipDescription description;
     int i, j, x, y, itemCount;
-    String type;
+    String type, uriString;
     Uri uri;
     EmacsActivity activity;
     StringBuilder builder;
+    ContentResolver resolver;
 
     x = (int) event.getX ();
     y = (int) event.getY ();
@@ -1799,6 +1801,20 @@ public final class EmacsWindow extends EmacsHandleObject
              {
                if ((activity.requestDragAndDropPermissions (event) == null))
                  uri = null;
+               else
+                 {
+                   resolver = activity.getContentResolver ();
+
+                   /* Substitute a content file name for the URI, if
+                      possible.  */
+                   uriString = EmacsService.buildContentName (uri, resolver);
+
+                   if (uriString != null)
+                     {
+                       builder.append (uriString).append ("\n");
+                       continue;
+                     }
+                 }
              }
 
            if (uri != null)

diff --git a/lisp/term/android-win.el b/lisp/term/android-win.el
index 1d10402b15dca2477aae40b5f706fb2e8fa7c81f..8d262e5da9804521e0f5743b9278634a6d79fd02 100644 (file)
--- a/lisp/term/android-win.el
+++ b/lisp/term/android-win.el
@@ -282,11 +282,12 @@ If it reflects the motion of an item above a frame, call
 `dnd-handle-movement' to move the cursor or scroll the window
 under the item pursuant to the pertinent user options.
 
-If it reflects dropped text, insert such text within window at
-the location of the drop.
+If it holds dropped text, insert such text within window at the
+location of the drop.
 
-If it reflects a list of URIs, then open each URI, converting
-content:// URIs into the special file names which represent them."
+If it holds a list of URIs, or file names, then open each URI or
+file name, converting content:// URIs into the special file
+names which represent them."
   (interactive "e")
   (let ((message (caddr event))
         (posn (event-start event)))
@@ -304,18 +305,22 @@ content:// URIs into the special file names which represent them."
                  (new-uri-list nil)
                  (dnd-unescape-file-uris t))
              (dolist (uri uri-list)
-               (ignore-errors
-                 (let ((url (url-generic-parse-url uri)))
-                   (when (equal (url-type url) "content")
-                     ;; Replace URI with a matching /content file
-                     ;; name.
-                     (setq uri (format "file:/content/by-authority/%s%s"
-                                       (url-host url)
-                                       (url-filename url))
-                           ;; And guarantee that this file URI is not
-                           ;; subject to URI decoding, for it must be
-                           ;; transformed back into a content URI.
-                           dnd-unescape-file-uris nil))))
+               ;; If the URI is a preprepared file name, insert it directly.
+               (if (string-match-p "^/content/by-authority\\(-named\\)?/" uri)
+                   (setq uri (concat "file:" uri)
+                         dnd-unescape-file-uris nil)
+                 (ignore-errors
+                   (let ((url (url-generic-parse-url uri)))
+                     (when (equal (url-type url) "content")
+                       ;; Replace URI with a matching /content file
+                       ;; name.
+                       (setq uri (format "file:/content/by-authority/%s%s"
+                                         (url-host url)
+                                         (url-filename url))
+                             ;; And guarantee that this file URI is not
+                             ;; subject to URI decoding, for it must be
+                             ;; transformed back into a content URI.
+                             dnd-unescape-file-uris nil)))))
                (push uri new-uri-list))
              (dnd-handle-multiple-urls (posn-window posn)
                                        new-uri-list