From 3db3a516eb30c0e3ee0ba44158686908311b1bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 1 Apr 2015 00:23:10 +0200 Subject: [PATCH] No need to clean search keywords when matching labels --- F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java | 7 ------- .../src/org/fdroid/fdroid/data/InstalledAppProvider.java | 5 ++--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java b/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java index 262c63d5a..aad493d4a 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java @@ -142,12 +142,5 @@ public abstract class FDroidProvider extends ContentProvider { } } } - - protected static String cleanQueryKeywords(String keywords) { - if (keywords == null) { - return null; - } - return keywords.trim(); - } } diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java index 8a10beaef..f3c704a87 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java @@ -129,10 +129,9 @@ public class InstalledAppProvider extends FDroidProvider { return new QuerySelection("appId = ?", new String[]{ appId }); } - private QuerySelection querySearch(String keywords) { - keywords = "%" + cleanQueryKeywords(keywords) + "%"; + private QuerySelection querySearch(String query) { return new QuerySelection("applicationLabel LIKE ?", - new String[]{ keywords }); + new String[]{ "%" + query + "%" }); } @Override