From 49ffe065766e0f0f2d36bc533ad9ed0c082f7b60 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Sat, 12 Dec 2015 10:02:45 +1100
Subject: [PATCH] Don't remove +'s from an fdroid.search intent.

As per CR comment. These don't really ressemble URIs very much, so I
don't think they will require sanitization like this at all.
---
 F-Droid/src/org/fdroid/fdroid/FDroid.java           | 2 +-
 F-Droid/src/org/fdroid/fdroid/compat/UriCompat.java | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java
index b7e04012b..4a41f1b4b 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroid.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroid.java
@@ -212,7 +212,7 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
             appId = data.getSchemeSpecificPart();
         } else if ("fdroid.search".equals(scheme)) {
             // fdroid.search:query
-            query = UriCompat.replacePlusWithSpace(data.getSchemeSpecificPart());
+            query = data.getSchemeSpecificPart();
         }
 
         if (!TextUtils.isEmpty(query)) {
diff --git a/F-Droid/src/org/fdroid/fdroid/compat/UriCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/UriCompat.java
index c703b1efd..90ffff0ca 100644
--- a/F-Droid/src/org/fdroid/fdroid/compat/UriCompat.java
+++ b/F-Droid/src/org/fdroid/fdroid/compat/UriCompat.java
@@ -13,13 +13,9 @@ public class UriCompat {
     public static String getQueryParameter(Uri uri, String key) {
         String value = uri.getQueryParameter(key);
         if (value != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            value = replacePlusWithSpace(value);
+            value = value.replaceAll("\\+", " ");
         }
         return value;
     }
 
-    public static String replacePlusWithSpace(String input) {
-        return input.replaceAll("\\+", " ");
-    }
-
 }