#1974: change pull request as discussed

* use trim instead of deletewhitespace

2 files changed, 4 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index e5cf679..638e509 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -103,7 +103,7 @@ public class SearchActivity extends AbstractActivity {
     private boolean instantSearch(final String query, final boolean keywordSearch) {
 
         // Check if any connector can handle the query as a geocode
-        final String geocode = StringUtils.deleteWhitespace(query);
+        final String geocode = StringUtils.trim(query);
         final IConnector connector = ConnectorFactory.getConnector(geocode);
         if (connector instanceof ISearchByGeocode) {
             final Intent cachesIntent = new Intent(this, CacheDetailActivity.class);
diff --git a/main/src/cgeo/geocaching/connector/ConnectorFactory.java b/main/src/cgeo/geocaching/connector/ConnectorFactory.java
index 784a54e..6b3afe9 100644
--- a/main/src/cgeo/geocaching/connector/ConnectorFactory.java
+++ b/main/src/cgeo/geocaching/connector/ConnectorFactory.java
@@ -50,7 +50,9 @@ public final class ConnectorFactory {
         return getConnector(cache.getGeocode());
     }
 
-    public static IConnector getConnector(String geocode) {
+    public static IConnector getConnector(final String geocodeInput) {
+        // this may come from user input
+        final String geocode = StringUtils.trim(geocodeInput);
         if (isInvalidGeocode(geocode)) {
             return UNKNOWN_CONNECTOR;
         }