Update Android port

* java/AndroidManifest.xml.in: Exclude non-files from opening in
Emacs.

* java/org/gnu/emacs/EmacsOpenActivity.java (onCreate): Avert
crash should scheme be NULL.

diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index d4017a055dd1b02162a41da10d7642b23e9305e6..9ba9dabde81bfe5b096b8ebeed43f2014d7495c2 100644 (file)
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -110,7 +110,10 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
        <action android:name="android.intent.action.EDIT"/>
        <action android:name="android.intent.action.PICK"/>
         <category android:name="android.intent.category.DEFAULT"/>
-       <data android:mimeType="*/*"/>
+       <!-- Don't offer to start Emacs for URLs that designate
+            resources other than files.  -->
+       <data android:mimeType="*/*" android:scheme="file"/>
+       <data android:mimeType="*/*" android:scheme="content"/>
       </intent-filter>
 
       <!-- Facilitate opening org-protocol:// URLs as well, the same

diff --git a/java/org/gnu/emacs/EmacsOpenActivity.java b/java/org/gnu/emacs/EmacsOpenActivity.java
index d27139e98bc505f39615d79f7c32a67cf7c8d86b..202b3c8c5dca69b491b513b72df0dccee7a9c5f6 100644 (file)
--- a/java/org/gnu/emacs/EmacsOpenActivity.java
+++ b/java/org/gnu/emacs/EmacsOpenActivity.java
@@ -438,6 +438,12 @@ public final class EmacsOpenActivity extends Activity
 
        scheme = uri.getScheme ();
 
+       /* It is possible for scheme to be NULL, under Android 2.3 at
+          least.  */
+
+       if (scheme == null)
+         return;
+
        /* If URL is a mailto URI, call `message-mailto' much the same
           way emacsclient-mail.desktop does.  */