From 25d2659b9361bc15a06acdd61199892ca3afb535 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Tue, 1 Nov 2016 00:14:54 +1100 Subject: [PATCH] Be more explicit about searching categories with free form text. --- .../org/fdroid/fdroid/data/AppProvider.java | 58 +++++++++++++------ .../fragments/AvailableAppsFragment.java | 2 +- .../fdroid/data/CategoryProviderTest.java | 27 +++++++++ .../fdroid/fdroid/data/ProviderUriTests.java | 13 +++-- 4 files changed, 76 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java index c8e2581c4..342126c3b 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java @@ -6,6 +6,7 @@ import android.content.Context; import android.content.UriMatcher; import android.database.Cursor; import android.net.Uri; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.Log; @@ -382,8 +383,9 @@ public class AppProvider extends FDroidProvider { private static final int CAN_UPDATE = CODE_SINGLE + 1; private static final int INSTALLED = CAN_UPDATE + 1; - private static final int SEARCH = INSTALLED + 1; - private static final int RECENTLY_UPDATED = SEARCH + 1; + private static final int SEARCH_TEXT = INSTALLED + 1; + private static final int SEARCH_TEXT_AND_CATEGORIES = SEARCH_TEXT + 1; + private static final int RECENTLY_UPDATED = SEARCH_TEXT_AND_CATEGORIES + 1; private static final int NEWLY_ADDED = RECENTLY_UPDATED + 1; private static final int CATEGORY = NEWLY_ADDED + 1; private static final int CALC_SUGGESTED_APKS = CATEGORY + 1; @@ -401,7 +403,8 @@ public class AppProvider extends FDroidProvider { MATCHER.addURI(getAuthority(), PATH_RECENTLY_UPDATED, RECENTLY_UPDATED); MATCHER.addURI(getAuthority(), PATH_NEWLY_ADDED, NEWLY_ADDED); MATCHER.addURI(getAuthority(), PATH_CATEGORY + "/*", CATEGORY); - MATCHER.addURI(getAuthority(), PATH_SEARCH + "/*", SEARCH); + MATCHER.addURI(getAuthority(), PATH_SEARCH + "/*/*", SEARCH_TEXT_AND_CATEGORIES); + MATCHER.addURI(getAuthority(), PATH_SEARCH + "/*", SEARCH_TEXT); MATCHER.addURI(getAuthority(), PATH_SEARCH_INSTALLED + "/*", SEARCH_INSTALLED); MATCHER.addURI(getAuthority(), PATH_SEARCH_CAN_UPDATE + "/*", SEARCH_CAN_UPDATE); MATCHER.addURI(getAuthority(), PATH_SEARCH_REPO + "/*/*", SEARCH_REPO); @@ -489,15 +492,23 @@ public class AppProvider extends FDroidProvider { return Uri.withAppendedPath(getContentUri(), packageName); } - public static Uri getSearchUri(String query) { - if (TextUtils.isEmpty(query)) { + public static Uri getSearchUri(String query, @Nullable String category) { + if (TextUtils.isEmpty(query) && TextUtils.isEmpty(category)) { // Return all the things for an empty search. return getContentUri(); + } else if (TextUtils.isEmpty(query)) { + return getCategoryUri(category); } - return getContentUri().buildUpon() + + Uri.Builder builder = getContentUri().buildUpon() .appendPath(PATH_SEARCH) - .appendPath(query) - .build(); + .appendPath(query); + + if (!TextUtils.isEmpty(category)) { + builder.appendPath(category); + } + + return builder.build(); } public static Uri getSearchInstalledUri(String query) { @@ -594,7 +605,6 @@ public class AppProvider extends FDroidProvider { final String app = getTableName(); final String[] columns = { PackageTable.NAME + "." + PackageTable.Cols.PACKAGE_NAME, - CategoryTable.NAME + "." + CategoryTable.Cols.NAME, app + "." + Cols.NAME, app + "." + Cols.SUMMARY, app + "." + Cols.DESCRIPTION, @@ -687,6 +697,10 @@ public class AppProvider extends FDroidProvider { } private AppQuerySelection queryCategory(String category) { + if (TextUtils.isEmpty(category)) { + return new AppQuerySelection(); + } + final String selection = CategoryTable.NAME + "." + CategoryTable.Cols.NAME + " = ? "; final String[] args = {category}; return new AppQuerySelection(selection, args); @@ -715,6 +729,7 @@ public class AppProvider extends FDroidProvider { int limit = 0; + List pathSegments = uri.getPathSegments(); switch (MATCHER.match(uri)) { case CALC_PREFERRED_METADATA: updatePreferredMetadata(); @@ -725,9 +740,8 @@ public class AppProvider extends FDroidProvider { break; case CODE_SINGLE: - List pathParts = uri.getPathSegments(); - long repoId = Long.parseLong(pathParts.get(1)); - String packageName = pathParts.get(2); + long repoId = Long.parseLong(pathSegments.get(1)); + String packageName = pathSegments.get(2); selection = selection.add(querySingle(packageName, repoId)); repoIsKnown = true; break; @@ -747,8 +761,15 @@ public class AppProvider extends FDroidProvider { includeSwap = false; break; - case SEARCH: - selection = selection.add(querySearch(uri.getLastPathSegment())); + case SEARCH_TEXT: + selection = selection.add(querySearch(pathSegments.get(1))); + includeSwap = false; + break; + + case SEARCH_TEXT_AND_CATEGORIES: + selection = selection + .add(querySearch(pathSegments.get(1))) + .add(queryCategory(pathSegments.get(2))); includeSwap = false; break; @@ -764,8 +785,8 @@ public class AppProvider extends FDroidProvider { case SEARCH_REPO: selection = selection - .add(querySearch(uri.getPathSegments().get(2))) - .add(queryRepo(Long.parseLong(uri.getPathSegments().get(1)))); + .add(querySearch(pathSegments.get(2))) + .add(queryRepo(Long.parseLong(pathSegments.get(1)))); repoIsKnown = true; break; @@ -775,9 +796,8 @@ public class AppProvider extends FDroidProvider { break; case TOP_FROM_CATEGORY: - List parts = uri.getPathSegments(); - selection = selection.add(queryCategory(parts.get(2))); - limit = Integer.parseInt(parts.get(1)); + selection = selection.add(queryCategory(pathSegments.get(2))); + limit = Integer.parseInt(pathSegments.get(1)); includeSwap = false; break; diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java index dfd4587aa..8cd21d398 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java @@ -185,7 +185,7 @@ public class AvailableAppsFragment extends AppListFragment implements @Override protected Uri getDataUri(String query) { - return AppProvider.getSearchUri(query); + return AppProvider.getSearchUri(query, null); } @Override diff --git a/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java index 1befeab9d..937383e3f 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java @@ -38,6 +38,33 @@ public class CategoryProviderTest extends FDroidProviderTest { // use a separate table in the future, these should still pass. // ======================================================================== + @Test + public void queryFreeTextAndCategories() { + insertAppWithCategory("com.dog", "Dog", "Animal"); + insertAppWithCategory("com.cat", "Cat", "Animal"); + insertAppWithCategory("com.crow", "Crow", "Animal,Bird"); + insertAppWithCategory("com.chicken", "Chicken", "Animal,Bird,Food"); + insertAppWithCategory("com.dog-statue", "Dog Statue", "Animal,Mineral"); + insertAppWithCategory("com.rock", "Rock", "Mineral"); + insertAppWithCategory("com.banana", "Banana", "Food"); + insertAppWithCategory("com.dog-food", "Dog Food", "Food"); + + assertPackagesInUri(AppProvider.getSearchUri("dog", "Animal"), new String[] { + "com.dog", + "com.dog-statue", + }); + + assertPackagesInUri(AppProvider.getSearchUri("dog", "Food"), new String[] { + "com.dog-food", + }); + + assertPackagesInUri(AppProvider.getSearchUri("dog", null), new String[] { + "com.dog", + "com.dog-statue", + "com.dog-food", + }); + } + @Test public void queryAppsInCategories() { insertAppWithCategory("com.dog", "Dog", "Animal"); diff --git a/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java b/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java index 2aa284e9d..410285fc3 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java +++ b/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java @@ -84,10 +84,15 @@ public class ProviderUriTests { ShadowContentResolver.registerProvider(AppProvider.getAuthority(), new AppProvider()); String[] projection = new String[] {Schema.AppMetadataTable.Cols._ID}; assertValidUri(resolver, AppProvider.getContentUri(), "content://org.fdroid.fdroid.data.AppProvider", projection); - assertValidUri(resolver, AppProvider.getSearchUri("'searching!'"), "content://org.fdroid.fdroid.data.AppProvider/search/'searching!'", projection); - assertValidUri(resolver, AppProvider.getSearchUri("/"), "content://org.fdroid.fdroid.data.AppProvider/search/%2F", projection); - assertValidUri(resolver, AppProvider.getSearchUri(""), "content://org.fdroid.fdroid.data.AppProvider", projection); - assertValidUri(resolver, AppProvider.getSearchUri(null), "content://org.fdroid.fdroid.data.AppProvider", projection); + assertValidUri(resolver, AppProvider.getSearchUri("'searching!'", null), "content://org.fdroid.fdroid.data.AppProvider/search/'searching!'", projection); + assertValidUri(resolver, AppProvider.getSearchUri("'searching!'", "Games"), "content://org.fdroid.fdroid.data.AppProvider/search/'searching!'/Games", projection); + assertValidUri(resolver, AppProvider.getSearchUri("/", null), "content://org.fdroid.fdroid.data.AppProvider/search/%2F", projection); + assertValidUri(resolver, AppProvider.getSearchUri("/", "Games"), "content://org.fdroid.fdroid.data.AppProvider/search/%2F/Games", projection); + assertValidUri(resolver, AppProvider.getSearchUri("", null), "content://org.fdroid.fdroid.data.AppProvider", projection); + assertValidUri(resolver, AppProvider.getCategoryUri("Games"), "content://org.fdroid.fdroid.data.AppProvider/category/Games", projection); + assertValidUri(resolver, AppProvider.getSearchUri("", "Games"), "content://org.fdroid.fdroid.data.AppProvider/category/Games", projection); + assertValidUri(resolver, AppProvider.getSearchUri((String) null, null), "content://org.fdroid.fdroid.data.AppProvider", projection); + assertValidUri(resolver, AppProvider.getSearchUri((String) null, "Games"), "content://org.fdroid.fdroid.data.AppProvider/category/Games", projection); assertValidUri(resolver, AppProvider.getInstalledUri(), "content://org.fdroid.fdroid.data.AppProvider/installed", projection); assertValidUri(resolver, AppProvider.getCanUpdateUri(), "content://org.fdroid.fdroid.data.AppProvider/canUpdate", projection);