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

Ensure file paths are not empty (avoids ICS bug)

Browse Source
This commit is contained in:
Kieran Clancy 2012-11-16 09:09:49 +10:30 committed by Adrian Ulrich
parent 34e72f1717
commit 762a2f365a
2 changed files with 7 additions and 5 deletions
src/ch/blinkenlights/android/vanilla
MediaAdapter.javaMediaUtils.java

2
src/ch/blinkenlights/android/vanilla/MediaAdapter.java

@ -255,7 +255,7 @@ public class MediaAdapter
String sort = String.format(mSortValues[mode], sortDir); String sort = String.format(mSortValues[mode], sortDir);
if (mType == MediaUtils.TYPE_SONG || forceMusicCheck) if (mType == MediaUtils.TYPE_SONG || forceMusicCheck)
selection.append("is_music!=0"); selection.append("is_music AND length(_data)");
if (constraint != null && constraint.length() != 0) { if (constraint != null && constraint.length() != 0) {
String[] needles; String[] needles;

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

@ -144,7 +144,7 @@ public class MediaUtils {
selection.append('='); selection.append('=');
selection.append(id); selection.append(id);
selection.append(" AND is_music!=0"); selection.append(" AND is_music AND length(_data)");
if (select != null) { if (select != null) {
selection.append(" AND "); selection.append(" AND ");
@ -365,7 +365,8 @@ public class MediaUtils {
{ {
if (sSongCount == -1) { if (sSongCount == -1) {
Uri media = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI; Uri media = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
String selection = MediaStore.Audio.Media.IS_MUSIC + "!=0"; String selection = MediaStore.Audio.Media.IS_MUSIC;
selection += " AND length(_data)";
Cursor cursor = resolver.query(media, new String[]{"count(_id)"}, selection, null, null); Cursor cursor = resolver.query(media, new String[]{"count(_id)"}, selection, null, null);
if (cursor == null) { if (cursor == null) {
sSongCount = 0; sSongCount = 0;
@ -391,7 +392,8 @@ public class MediaUtils {
sRandomCacheEnd = -1; sRandomCacheEnd = -1;
Uri media = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI; Uri media = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
String selection = MediaStore.Audio.Media.IS_MUSIC + "!=0"; String selection = MediaStore.Audio.Media.IS_MUSIC;
selection += " AND length(_data)";
Cursor cursor = resolver.query(media, Song.EMPTY_PROJECTION, selection, null, null); Cursor cursor = resolver.query(media, Song.EMPTY_PROJECTION, selection, null, null);
if (cursor == null || cursor.getCount() == 0) { if (cursor == null || cursor.getCount() == 0) {
sSongCount = 0; sSongCount = 0;
@ -526,7 +528,7 @@ public class MediaUtils {
DatabaseUtils.appendEscapedSQLString(selection, path); DatabaseUtils.appendEscapedSQLString(selection, path);
// delete the quotation mark added by the escape method // delete the quotation mark added by the escape method
selection.deleteCharAt(selection.length() - 1); selection.deleteCharAt(selection.length() - 1);
selection.append("*' AND is_music!=0"); selection.append("*' AND is_music");
Uri media = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI; Uri media = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
QueryTask result = new QueryTask(media, projection, selection.toString(), null, DEFAULT_SORT); QueryTask result = new QueryTask(media, projection, selection.toString(), null, DEFAULT_SORT);