fix #2250: "Scan QR code" doesn't work anymore

1 files changed, 7 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index 35fe70d..65003e2 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -100,9 +100,14 @@ public class SearchActivity extends AbstractActivity {
      * @return true if a search was performed, else false
      */
     private boolean instantSearch(final String query, final boolean keywordSearch) {
+        // first check if this was a scanned URL
+        String geocode = ConnectorFactory.getGeocodeFromURL(query);
+
+        // otherwise see if this is a pure geocode
+        if (StringUtils.isEmpty(geocode)) {
+            geocode = StringUtils.trim(query);
+        }
 
-        // Check if any connector can handle the query as a geocode
-        final String geocode = StringUtils.trim(query);
         final IConnector connector = ConnectorFactory.getConnector(geocode);
         if (connector instanceof ISearchByGeocode) {
             final Intent cachesIntent = new Intent(this, CacheDetailActivity.class);