sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed security exception when attempting to display image in notification

This commit is contained in:
Daniel Gultsch 2019-03-03 08:32:54 +01:00
parent 875f0b9943
commit c7dea9dded
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
View File

@ -413,11 +413,16 @@ public class FileBackend {
public static Uri getMediaUri(Context context, File file) { public static Uri getMediaUri(Context context, File file) {
final String filePath = file.getAbsolutePath(); final String filePath = file.getAbsolutePath();
final Cursor cursor = context.getContentResolver().query( final Cursor cursor;
MediaStore.Images.Media.EXTERNAL_CONTENT_URI, try {
new String[] { MediaStore.Images.Media._ID }, cursor = context.getContentResolver().query(
MediaStore.Images.Media.DATA + "=? ", MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
new String[] { filePath }, null); new String[]{MediaStore.Images.Media._ID},
MediaStore.Images.Media.DATA + "=? ",
new String[]{filePath}, null);
} catch (SecurityException e) {
return null;
}
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
final int id = cursor.getInt(cursor.getColumnIndex(MediaStore.MediaColumns._ID)); final int id = cursor.getInt(cursor.getColumnIndex(MediaStore.MediaColumns._ID));
cursor.close(); cursor.close();