Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make category searching case insensitive. Only works for ASCII :(

Browse Source
This commit is contained in:
Peter Serwylo 2016-11-01 00:24:10 +11:00
parent 25d2659b93
commit f4c03c6baa
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
View File

@ -701,7 +701,10 @@ public class AppProvider extends FDroidProvider {
return new AppQuerySelection(); return new AppQuerySelection();
} }
final String selection = CategoryTable.NAME + "." + CategoryTable.Cols.NAME + " = ? "; // Note, the COLLATE NOCASE only works for ASCII columns. The "ICU extension" for SQLite
// provides proper case management for Unicode characters, but is not something provided
// by Android.
final String selection = CategoryTable.NAME + "." + CategoryTable.Cols.NAME + " = ? COLLATE NOCASE ";
final String[] args = {category}; final String[] args = {category};
return new AppQuerySelection(selection, args); return new AppQuerySelection(selection, args);
} }

2
app/src/main/java/org/fdroid/fdroid/data/CategoryProvider.java
View File

@ -185,7 +185,7 @@ public class CategoryProvider extends FDroidProvider {
} }
protected QuerySelection querySingle(String categoryName) { protected QuerySelection querySingle(String categoryName) {
final String selection = getTableName() + "." + Cols.NAME + " = ?"; final String selection = getTableName() + "." + Cols.NAME + " = ? COLLATE NOCASE";
final String[] args = {categoryName}; final String[] args = {categoryName};
return new QuerySelection(selection, args); return new QuerySelection(selection, args);
} }

7
app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java
View File

@ -82,6 +82,13 @@ public class CategoryProviderTest extends FDroidProviderTest {
"com.chicken", "com.chicken",
}); });
assertPackagesInCategory("animal", new String[] {
"com.dog",
"com.cat",
"com.crow",
"com.chicken",
});
assertPackagesInCategory("Bird", new String[]{ assertPackagesInCategory("Bird", new String[]{
"com.crow", "com.crow",
"com.chicken", "com.chicken",