narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

don't attempt to figure out file path on Android 11+

Browse source 
fixes #117
This commit is contained in:
Daniel Gultsch 2023-10-05 20:28:47 +02:00
parent d9c9baf516
commit 95aea4291e
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
View file

@ -648,8 +648,13 @@ public class FileBackend {
} }
} }
public String getOriginalPath(Uri uri) { public String getOriginalPath(final Uri uri) {
return FileUtils.getPath(mXmppConnectionService, uri); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
// On Android 11+ we don’t have access to the original file
return null;
} else {
return FileUtils.getPath(mXmppConnectionService, uri);
}
} }
private void copyFileToPrivateStorage(File file, Uri uri) throws FileCopyException { private void copyFileToPrivateStorage(File file, Uri uri) throws FileCopyException {

4
src/main/java/eu/siacs/conversations/utils/FileUtils.java
View file

@ -34,10 +34,8 @@ public class FileUtils {
return null; return null;
} }
final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
// DocumentProvider // DocumentProvider
if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) { if (DocumentsContract.isDocumentUri(context, uri)) {
// ExternalStorageProvider // ExternalStorageProvider
if (isExternalStorageDocument(uri)) { if (isExternalStorageDocument(uri)) {
final String docId = DocumentsContract.getDocumentId(uri); final String docId = DocumentsContract.getDocumentId(uri);