Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-08 09:18:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the last part of the URI if the scheme is "file" to avoid returning null as the file's name. Fixes #8561

Browse Source
This commit is contained in:
Fumiaki Yoshimatsu
2021-02-21 14:21:20 -05:00
committed by Cody Henthorne
parent da34f9e989
commit d254d24d77
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/sharing/ShareRepository.java
+4
View File
@@ -233,6 +233,10 @@ class ShareRepository {
} }
private static @Nullable String getFileName(@NonNull Context context, @NonNull Uri uri) { private static @Nullable String getFileName(@NonNull Context context, @NonNull Uri uri) {
if (uri.getScheme().equalsIgnoreCase("file")) {
return uri.getLastPathSegment();
}
try (Cursor cursor = context.getContentResolver().query(uri, null, null, null, null)) { try (Cursor cursor = context.getContentResolver().query(uri, null, null, null, null)) {
if (cursor != null && cursor.moveToFirst() && cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME) >= 0) { if (cursor != null && cursor.moveToFirst() && cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME) >= 0) {
return cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)); return cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME));