mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-12 14:30:42 -08:00
Code Issues Projects Releases Wiki Activity

Facilitate opening content:// files without a linked file name

Browse source 
* java/org/gnu/emacs/EmacsOpenActivity.java
(checkReadableOrCopy): If FILE is NULL, return a matching
content URI if possible, else generate a file name with the URI
as a reference.
(onCreate): Catch SecurityException around calls to
openFileDescriptor.
This commit is contained in:
Po Lu 2023-09-13 09:24:16 +08:00
parent f542a4537e
commit 9500fbe231
1 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

40
java/org/gnu/emacs/EmacsOpenActivity.java
View file

@ -213,12 +213,13 @@ public final class EmacsOpenActivity extends Activity
dialog.show ();
}
/* Check that the specified FILE is readable. If Android 4.4 or
later is being used, return URI formatted into a `/content/' file
name.
/* Check that the specified FILE is non-NULL and 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. */
system cache directory and return the name of that file.
Alternatively, return URI formatted into a `/content/' file name
if the system runs Android 4.4 or later. */
private String
checkReadableOrCopy (String file, ParcelFileDescriptor fd,
@ -232,10 +233,19 @@ public final class EmacsOpenActivity extends Activity
int read;
String content;
inFile = new File (file);
if (file != null)
{
inFile = new File (file);
if (inFile.canRead ())
return file;
if (inFile.canRead ())
return file;
content = inFile.getName ();
}
else
/* content is the name of this content file if the next branch
is not taken. */
content = uri.getLastPathSegment ();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
{
@ -243,8 +253,14 @@ public final class EmacsOpenActivity extends Activity
return content;
}
/* The file is unnamed if content is NULL. Generate a unique
name with the current time as a reference. */
if (content == null)
content = "content." + System.currentTimeMillis () / 1000;
/* inFile is now the file being written to. */
inFile = new File (getCacheDir (), inFile.getName ());
inFile = new File (getCacheDir (), content);
buffer = new byte[4098];
/* Initialize both streams to NULL. */
@ -464,6 +480,14 @@ public final class EmacsOpenActivity extends Activity
{
/* Do nothing. */
}
catch (SecurityException exception)
{
/* This means Emacs lacks the rights to open this
file. Display the error message and exit. */
displayFailureDialog ("Error openining file",
exception.toString ());
return;
}
if (fd != null)
{