summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android/androidcontentfileengine.cpp
diff options
context:
space:
mode:
authorVolker Krause <[email protected]>2024-01-02 18:11:03 +0100
committerVolker Krause <[email protected]>2024-01-09 02:26:48 +0000
commit9d4a34bbbe7ec39ef594b07aae06fc1029cc6e3d (patch)
tree42746edac8b1bd287ff9398d64d5b42428cc469d /src/plugins/platforms/android/androidcontentfileengine.cpp
parent11333a097290e4247b27adbfd024d5aa964bed35 (diff)
Fix opening temporary content: URIs from application content providers
e5d591a0d09 focused on document or tree URIs you'd get from the file dialog, but we can also get ones via Intents from application-specific content providers (e.g. opening an attachment from an email client). Those need to be handled like a single document here, parsing them like a tree URI results in a bunch of Java exceptions down the line. Change-Id: I19cb1075fd6a3ccad927543f8bc5a63566f4877e Pick-to: 6.7 6.6 6.5 Reviewed-by: Assam Boudjelthia <[email protected]>
Diffstat (limited to 'src/plugins/platforms/android/androidcontentfileengine.cpp')
-rw-r--r--src/plugins/platforms/android/androidcontentfileengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/androidcontentfileengine.cpp b/src/plugins/platforms/android/androidcontentfileengine.cpp
index cd7913fddfe..52ca0114c7b 100644
--- a/src/plugins/platforms/android/androidcontentfileengine.cpp
+++ b/src/plugins/platforms/android/androidcontentfileengine.cpp
@@ -608,7 +608,7 @@ DocumentFilePtr DocumentFile::parseFromAnyUri(const QString &fileName)
const QString encodedUri = QUrl(fileName).toEncoded();
const QJniObject uri = parseUri(encodedUri);
- if (DocumentsContract::isDocumentUri(uri))
+ if (DocumentsContract::isDocumentUri(uri) || !DocumentsContract::isTreeUri(uri))
return fromSingleUri(uri);
const QString documentType = "/document/"_L1;