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

Fix problems when selector constraint includes 'the', 'a', etc

Browse Source
This commit is contained in:
Christopher Eby 2010-05-09 21:28:15 -05:00
parent 4de4f8a31e
commit 8d13993613
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/kreed/vanilla/MediaAdapter.java
View File

@ -22,6 +22,7 @@ import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Resources;
import android.database.Cursor;
import android.database.DatabaseUtils;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
@ -126,8 +127,11 @@ public class MediaAdapter extends CursorAdapter implements FilterQueryProvider {
}
if (constraint != null && constraint.length() != 0) {
String[] constraints = constraint.toString().split("\\s+");
int size = constraints.length;
String colKey = MediaStore.Audio.keyFor(constraint.toString());
String spaceColKey = DatabaseUtils.getCollationKey(" ");
String[] colKeys = colKey.split(spaceColKey);
int size = colKeys.length;
if (limiter != null)
++size;
selectionArgs = new String[size];
@ -136,11 +140,13 @@ public class MediaAdapter extends CursorAdapter implements FilterQueryProvider {
selectionArgs[0] = limiter;
i = 1;
}
String keys = mFieldKeys[0];
for (int j = 1; j != mFieldKeys.length; ++j)
keys += "||" + mFieldKeys[j];
for (int j = 0; j != constraints.length; ++i, ++j) {
selectionArgs[i] = '%' + MediaStore.Audio.keyFor(constraints[j]) + '%';
for (int j = 0; j != colKeys.length; ++i, ++j) {
selectionArgs[i] = '%' + colKeys[j] + '%';
if (j != 0 || selection.length() != 0)
selection.append(" AND ");