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

Ignore leading and trailing whitespaces in search keywords

Browse Source 
As reported in #58
This commit is contained in:
Daniel Martí 2015-03-30 17:41:35 +02:00
parent 85d7752d0a
commit d22c714dbd
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
View File

@ -497,14 +497,14 @@ public class AppProvider extends FDroidProvider {
}
private AppQuerySelection querySearch(String keywords) {
keywords = "%" + keywords + "%";
keywords = "%" + cleanQueryKeywords(keywords) + "%";
String selection =
"fdroid_app.id like ? OR " +
"fdroid_app.name like ? OR " +
"fdroid_app.summary like ? OR " +
"fdroid_app.description like ? ";
String[] args = new String[] { keywords, keywords, keywords, keywords};
return new AppQuerySelection(selection, args);
return new AppQuerySelection(selection,
new String[] { keywords, keywords, keywords, keywords });
}
private AppQuerySelection querySingle(String id) {

7
F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java
View File

@ -142,5 +142,12 @@ public abstract class FDroidProvider extends ContentProvider {
}
}
}
protected static String cleanQueryKeywords(String keywords) {
if (keywords == null) {
return null;
}
return keywords.trim();
}
}

4
F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java
View File

@ -128,7 +128,9 @@ public class InstalledAppProvider extends FDroidProvider {
}
private QuerySelection querySearch(String keywords) {
return new QuerySelection("applicationLabel LIKE ?", new String[]{ "%" + keywords + "%" });
keywords = "%" + cleanQueryKeywords(keywords) + "%";
return new QuerySelection("applicationLabel LIKE ?",
new String[]{ keywords });
}
@Override