From 6bfd76caf2292da2e11148560bcef65c4e1c5393 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Sun, 16 Aug 2015 23:57:35 +1000 Subject: [PATCH] Search now works when choosing swapped apps to install. Was incorrectly parsing the URI in order to build a query for the database. --- F-Droid/src/org/fdroid/fdroid/data/AppProvider.java | 4 ++-- F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java index e9c742969..0d439c105 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java @@ -712,8 +712,8 @@ public class AppProvider extends FDroidProvider { break; case SEARCH_REPO: - selection = selection.add(querySearch(uri.getPathSegments().get(1))); - selection = selection.add(queryRepo(Long.parseLong(uri.getPathSegments().get(0)))); + selection = selection.add(querySearch(uri.getPathSegments().get(2))); + selection = selection.add(queryRepo(Long.parseLong(uri.getPathSegments().get(1)))); break; case NO_APKS: diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java index a5e68852b..8b79eb0df 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java @@ -70,7 +70,6 @@ import java.util.TimerTask; * * TODO: Starting wifi after cancelling swap and beginning again doesn't work properly * TODO: Scan QR hangs when updating repoo. Swapper was 2.3.3 and Swappee was 5.0 - * TODO: Search in "touch to install apps" screen is busted, causes crash. * */ public class SwapService extends Service {