norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Add missing cursor != null check.

Browse Source 
Samsung seems to return a null cursor instead of throwing a SecurityException.
This commit is contained in:
Adrian Ulrich 2017-05-31 18:37:59 +02:00
parent 8f7dff2550
commit 3a421e7a39
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ch/blinkenlights/android/vanilla/MediaUtils.java
View File

@ -590,11 +590,13 @@ public class MediaUtils {
String[] projection = new String[]{ MediaStore.Audio.Media._ID, MediaStore.Audio.Media.ALBUM_ID, MediaStore.Audio.Media.ARTIST_ID };
try {
Cursor cursor = context.getContentResolver().query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, projection, MediaStore.Audio.Media.DATA+"=?", new String[] { song.path }, null);
if (cursor.moveToFirst()) {
for (int i=0; i<result.length; i++)
result[i] = cursor.getLong(i);
if (cursor != null) {
if (cursor.moveToFirst()) {
for (int i=0; i<result.length; i++)
result[i] = cursor.getLong(i);
}
cursor.close();
}
cursor.close();
} catch (SecurityException e) {
Log.e("VanillaMusic", "Wowies: No permission to read EXTERNAL_CONTENT_URI for song "+song.path+": "+e);
}