Update Android port

* doc/emacs/android.texi (Android Startup): Document `content'
special directory.
* java/debug.sh (is_root): Improve /bin/tee detection.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): New
function `dup'.
* java/org/gnu/emacs/EmacsOpenActivity.java (EmacsOpenActivity)
(checkReadableOrCopy, onCreate): Create content directory names
when the file is not readable.
* java/org/gnu/emacs/EmacsService.java (EmacsService)
(openContentUri, checkContentUri): New functions.
* src/android.c (struct android_emacs_service): New methods.
(android_content_name_p, android_get_content_name)
(android_check_content_access): New function.
(android_fstatat, android_open): Implement opening content URIs.
(dup): Export to Java.
(android_init_emacs_service): Initialize new methods.
(android_faccessat): Implement content file names.

1 files changed, 36 insertions, 6 deletions

diff --git a/java/org/gnu/emacs/EmacsOpenActivity.java b/java/org/gnu/emacs/EmacsOpenActivity.java
index c8501d91025..87ce454a816 100644
--- a/java/org/gnu/emacs/EmacsOpenActivity.java
+++ b/java/org/gnu/emacs/EmacsOpenActivity.java
@@ -57,6 +57,8 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
 
+import android.util.Log;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -69,6 +71,8 @@ import java.io.UnsupportedEncodingException;
 public class EmacsOpenActivity extends Activity
   implements DialogInterface.OnClickListener
 {
+  private static final String TAG = "EmacsOpenActivity";
+
   private class EmacsClientThread extends Thread
   {
     private ProcessBuilder builder;
@@ -178,12 +182,16 @@ public class EmacsOpenActivity extends Activity
     dialog.show ();
   }
 
-  /* Check that the specified FILE is readable.  If it is not, then
-     copy the file in FD to a location in the system cache
-     directory and return the name of that file.  */
+  /* Check that the specified FILE is readable.  If Android 4.4 or
+     later is being used, return URI formatted into a `/content/' file
+     name.
+
+     If it is not, then copy the file in FD to a location in the
+     system cache directory and return the name of that file.  */
 
   private String
-  checkReadableOrCopy (String file, ParcelFileDescriptor fd)
+  checkReadableOrCopy (String file, ParcelFileDescriptor fd,
+		       Uri uri)
     throws IOException, FileNotFoundException
   {
     File inFile;
@@ -191,12 +199,34 @@ public class EmacsOpenActivity extends Activity
     InputStream stream;
     byte buffer[];
     int read;
+    String content;
+
+    Log.d (TAG, "checkReadableOrCopy: " + file);
 
     inFile = new File (file);
 
-    if (inFile.setReadable (true))
+    if (inFile.canRead ())
       return file;
 
+    Log.d (TAG, "checkReadableOrCopy: NO");
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+      {
+	content = "/content/" + uri.getEncodedAuthority ();
+
+	for (String segment : uri.getPathSegments ())
+	  content += "/" + Uri.encode (segment);
+
+	/* Append the URI query.  */
+
+	if (uri.getEncodedQuery () != null)
+	  content += "?" + uri.getEncodedQuery ();
+
+	Log.d (TAG, "checkReadableOrCopy: " + content);
+
+	return content;
+      }
+
     /* inFile is now the file being written to.  */
     inFile = new File (getCacheDir (), inFile.getName ());
     buffer = new byte[4098];
@@ -398,7 +428,7 @@ public class EmacsOpenActivity extends Activity
 		    if (names != null)
 		      fileName = new String (names, "UTF-8");
 
-		    fileName = checkReadableOrCopy (fileName, fd);
+		    fileName = checkReadableOrCopy (fileName, fd, uri);
 		  }
 		catch (FileNotFoundException exception)
 		  {