Do not use an extra indirection for storing search results

What is called search result (or cgSearch) in c:geo is a collection
of caches that can or cannot come from a real search.

Remove the indirection and the ever-growing hash map that was previously
used. This will save memory, especially when using live maps.

See discussion in issue #707.

1 files changed, 2 insertions, 3 deletions

diff --git a/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java b/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java
index 6334973..3c193d9 100644
--- a/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java
+++ b/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java
@@ -12,7 +12,6 @@ import cgeo.geocaching.utils.CryptUtils;
 import android.os.Handler;
 
 import java.util.List;
-import java.util.UUID;
 
 public class ApiOpenCachingConnector extends OpenCachingConnector implements IConnector {
 
@@ -39,7 +38,7 @@ public class ApiOpenCachingConnector extends OpenCachingConnector implements ICo
     }
 
     @Override
-    public UUID searchByGeocode(final cgBase base, final String geocode, final String guid, final cgeoapplication app, final cgSearch search, final int reason, final Handler handler) {
+    public cgSearch searchByGeocode(final cgBase base, final String geocode, final String guid, final cgeoapplication app, final cgSearch search, final int reason, final Handler handler) {
         final cgCache cache = OkapiClient.getCache(geocode);
         if (cache == null) {
             return null;
@@ -50,6 +49,6 @@ public class ApiOpenCachingConnector extends OpenCachingConnector implements ICo
         final List<cgCache> cacheList = cgBase.filterSearchResults(search, caches, false, false, null);
         app.addSearch(search, cacheList, true, reason);
 
-        return search.getCurrentId();
+        return search;
     }
 }