1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-21 09:38:01 +02:00

Android: Fixed #8533: Fix sharing image to Joplin (#8970)

This commit is contained in:
Self Not Found 2023-10-05 18:51:46 +08:00 committed by GitHub
parent ef6d94973c
commit b8aab34d1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -7,6 +7,7 @@ import android.content.ContentResolver;
import android.content.Intent; import android.content.Intent;
import android.content.UriPermission; import android.content.UriPermission;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteException;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.provider.DocumentsContract; import android.provider.DocumentsContract;
@ -97,17 +98,17 @@ public class EfficientDocumentHelper {
return uri; return uri;
} else if (UriHelper.isDocumentUri(uri) || !DocumentsContract.isTreeUri(uri)) { } else if (UriHelper.isDocumentUri(uri) || !DocumentsContract.isTreeUri(uri)) {
// It's a document picked by user, nothing much we can do. operations limited. // It's a document picked by user, nothing much we can do. operations limited.
DocumentStat stat = null; boolean documentExists = false;
try { try {
stat = getStat(uri); documentExists = checkIfExists(uri);
} catch (Exception ignored) { } catch (Exception ignored) {
if (createIfDirectoryNotExist) { if (createIfDirectoryNotExist) {
throw new IOExceptionFast("Unsupported uri: " + unknownUriStr); throw new IOExceptionFast("Unsupported uri: " + unknownUriStr);
} }
} }
if (stat == null) { if (!documentExists) {
throw new FileNotFoundExceptionFast("file does not exist at: " + unknownUriStr); throw new FileNotFoundExceptionFast("file does not exist at: " + unknownUriStr);
} }
@ -146,7 +147,7 @@ public class EfficientDocumentHelper {
int pathSegmentsToTraverseLength = includeLastSegment ? strings.length : strings.length - 1; int pathSegmentsToTraverseLength = includeLastSegment ? strings.length : strings.length - 1;
if (pathSegmentsToTraverseLength == 0) { if (pathSegmentsToTraverseLength == 0) {
if (getStat(uri) == null) { if (!checkIfExists(uri)) {
throw new FileNotFoundExceptionFast("file does not exist at: " + unknownUriStr); throw new FileNotFoundExceptionFast("file does not exist at: " + unknownUriStr);
} }
} }
@ -248,6 +249,39 @@ public class EfficientDocumentHelper {
return null; return null;
} }
@Nullable
private boolean checkIfExists(@NonNull Uri uri) {
if (uri.getScheme().equals(ContentResolver.SCHEME_FILE)) {
File file = new File(uri.getPath());
return file.exists();
}
final ContentResolver resolver = context.getContentResolver();
// query single column(COLUMN_DOCUMENT_ID) for best performance
try (Cursor c =
resolver.query(
uri,
queryIfExistsColumn,
null,
null,
null)) {
if (c != null && c.moveToNext()) {
return true;
}
} catch (SQLiteException ignored) {
// fallback:
// some ContentProvider doesn't provide COLUMN_DOCUMENT_ID
// try to query all column(a bit slower)
try (Cursor c = resolver.query(uri, null, null, null, null)) {
if (c != null && c.moveToNext()) {
return true;
}
}
}
return false;
}
private Uri createDirectory(@NonNull Uri parentTreeUri, @NonNull String name) throws IOException { private Uri createDirectory(@NonNull Uri parentTreeUri, @NonNull String name) throws IOException {
Uri createdDir = DocumentsContract.createDocument( Uri createdDir = DocumentsContract.createDocument(
context.getContentResolver(), buildDocumentUriUsingTree(parentTreeUri), DocumentsContract.Document.MIME_TYPE_DIR, context.getContentResolver(), buildDocumentUriUsingTree(parentTreeUri), DocumentsContract.Document.MIME_TYPE_DIR,
@ -267,6 +301,10 @@ public class EfficientDocumentHelper {
DocumentsContract.Document.COLUMN_LAST_MODIFIED, DocumentsContract.Document.COLUMN_LAST_MODIFIED,
}; };
private static final String[] queryIfExistsColumn = new String[]{
DocumentsContract.Document.COLUMN_DOCUMENT_ID,
};
private Uri getChildrenDocumentFromTreeUri(@NonNull Uri treeUri) { private Uri getChildrenDocumentFromTreeUri(@NonNull Uri treeUri) {
String documentId = DocumentsContract.getTreeDocumentId(treeUri); String documentId = DocumentsContract.getTreeDocumentId(treeUri);
if (DocumentsContract.isDocumentUri(context, treeUri)) { if (DocumentsContract.isDocumentUri(context, treeUri)) {
@ -635,8 +673,7 @@ public class EfficientDocumentHelper {
public Object doAsync() { public Object doAsync() {
try { try {
Uri uri = getDocumentUri(unknownStr, false, true); Uri uri = getDocumentUri(unknownStr, false, true);
DocumentStat stats = getStat(uri); if (!checkIfExists(uri)) {
if (stats == null) {
throw new FileNotFoundExceptionFast("'" + unknownStr + "' does not exist"); throw new FileNotFoundExceptionFast("'" + unknownStr + "' does not exist");
} }
@ -741,25 +778,33 @@ public class EfficientDocumentHelper {
public Object doAsync() { public Object doAsync() {
try { try {
Uri srcUri = getDocumentUri(unknownSrcUri, false, true); Uri srcUri = getDocumentUri(unknownSrcUri, false, true);
DocumentStat srcStats = getStat(srcUri); DocumentStat srcStats = null;
try {
if (srcStats == null) { srcStats = getStat(srcUri);
} catch (Exception e) {
if(!checkIfExists(srcUri)) {
throw new FileNotFoundExceptionFast("Document at given Uri does not exist: " + unknownDestUri); throw new FileNotFoundExceptionFast("Document at given Uri does not exist: " + unknownDestUri);
} }
}
Uri destUri; Uri destUri;
try { try {
destUri = getDocumentUri(unknownDestUri, false, true); destUri = getDocumentUri(unknownDestUri, false, true);
if (!replaceIfDestExists) { if (!replaceIfDestExists) {
DocumentStat destStat = getStat(destUri); if (checkIfExists(destUri)) {
if (destStat != null) {
throw new IOExceptionFast("a document with the same name already exists in destination"); throw new IOExceptionFast("a document with the same name already exists in destination");
} else { } else {
throw new FileNotFoundExceptionFast(); throw new FileNotFoundExceptionFast();
} }
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
if (srcStats != null) {
destUri = createFile(unknownDestUri, srcStats.getMimeType()); destUri = createFile(unknownDestUri, srcStats.getMimeType());
} else {
// createFile() will treat mimetype null as "*/*"
destUri = createFile(unknownDestUri, null);
}
} }
try (InputStream inStream = try (InputStream inStream =