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

possible fix for https://github.com/vanilla-music/vanilla/issues/336

Browse Source
This commit is contained in:
Adrian Ulrich 2016-05-06 08:45:29 +02:00
parent 0cca0a452c
commit 0113307fec
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ch/blinkenlights/android/vanilla/MediaAdapter.java
View File

@ -69,6 +69,10 @@ public class MediaAdapter
private static final String SORT_MAGIC_PLAYCOUNT = "__PLAYCOUNT_SORT"; private static final String SORT_MAGIC_PLAYCOUNT = "__PLAYCOUNT_SORT";
/**
* The string to use for length==0 db fields
*/
private static final String DB_NULLSTRING_FALLBACK = "???";
/** /**
* A context to use. * A context to use.
*/ */
@ -536,8 +540,8 @@ public class MediaAdapter
if (mProjection.length >= 5) { if (mProjection.length >= 5) {
String line1 = cursor.getString(2); String line1 = cursor.getString(2);
String line2 = cursor.getString(3); String line2 = cursor.getString(3);
line1 = (line1 == null ? "???" : line1); line1 = (line1 == null ? DB_NULLSTRING_FALLBACK : line1);
line2 = (line2 == null ? "???" : line2 + ", " + cursor.getString(4)); line2 = (line2 == null ? DB_NULLSTRING_FALLBACK : line2 + ", " + cursor.getString(4));
SpannableStringBuilder sb = new SpannableStringBuilder(line1); SpannableStringBuilder sb = new SpannableStringBuilder(line1);
sb.append('\n'); sb.append('\n');
@ -547,7 +551,7 @@ public class MediaAdapter
holder.title = line1; holder.title = line1;
} else { } else {
String title = cursor.getString(2); String title = cursor.getString(2);
if(title == null) { title = "???"; } if(title == null) { title = DB_NULLSTRING_FALLBACK; }
holder.text.setText(title); holder.text.setText(title);
holder.title = title; holder.title = title;
} }
@ -723,6 +727,7 @@ public class MediaAdapter
} }
cursor.moveToFirst(); cursor.moveToFirst();
String lastString = null;
Object lastKnown = null; Object lastKnown = null;
Object next; Object next;
do { do {
@ -735,7 +740,11 @@ public class MediaAdapter
next = cursor.getInt(sortColumnIndex); next = cursor.getInt(sortColumnIndex);
break; break;
case Cursor.FIELD_TYPE_STRING: case Cursor.FIELD_TYPE_STRING:
next = cursor.getString(sortColumnIndex).charAt(0); lastString = cursor.getString(sortColumnIndex);
if (lastString.length() < 1)
lastString = DB_NULLSTRING_FALLBACK;
next = lastString.charAt(0);
break; break;
default: default:
continue; continue;