Cleanup addSearch

Now, addSearch:
- has only one version (the other one was only a proxy)
- does not return anything
- has no longer the search and newItem parameters
- calls with a newItem==false parameter have been removed

5 files changed, 15 insertions, 47 deletions

diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index 81ae41d..c5954b6 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -2044,13 +2044,11 @@ public class cgBase {
         cgeoapplication.setError(search, caches.error);
         cgeoapplication.setViewstates(search, caches.viewstates);
 
-        final List<cgCache> cacheList = new ArrayList<cgCache>();
-        for (cgCache cache : caches.cacheList) {
+        for (final cgCache cache : caches.cacheList) {
             cgeoapplication.addGeocode(search, cache.getGeocode());
-            cacheList.add(cache);
         }
 
-        app.addSearch(search, cacheList, true, reason);
+        app.addSearch(caches.cacheList, reason);
 
         return search;
     }
@@ -2065,16 +2063,7 @@ public class cgBase {
 
         if (!forceReload && reason == 0 && (app.isOffline(geocode, guid) || app.isThere(geocode, guid, true, true))) {
             final String realGeocode = StringUtils.isNotBlank(geocode) ? geocode : app.getGeocode(guid);
-
-            List<cgCache> cacheList = new ArrayList<cgCache>();
-            cacheList.add(app.getCacheByGeocode(realGeocode, cgCache.LOADALL));
             search.addGeocode(realGeocode);
-
-            app.addSearch(search, cacheList, false, reason);
-
-            cacheList.clear();
-            cacheList = null;
-
             return search;
         }
 
@@ -2137,8 +2126,7 @@ public class cgBase {
         }
 
         List<cgCache> cacheList = filterSearchResults(search, caches, Settings.isExcludeDisabledCaches(), false, null);
-
-        app.addSearch(search, cacheList, true, reason);
+        app.addSearch(cacheList, reason);
 
         return search;
     }
@@ -2212,7 +2200,7 @@ public class cgBase {
 
         List<cgCache> cacheList = filterSearchResults(search, caches, Settings.isExcludeDisabledCaches(), Settings.isExcludeMyCaches(), Settings.getCacheType());
 
-        app.addSearch(search, cacheList, true, reason);
+        app.addSearch(cacheList, reason);
 
         return search;
     }
diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java
index 7c93c47..8c31943 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/cgeoapplication.java
@@ -534,31 +534,19 @@ public class cgeoapplication extends Application {
         search.addGeocode(geocode);
     }
 
-    public cgSearch addSearch(final cgSearch search, List<cgCache> cacheList, Boolean newItem, int reason) {
-        if (search == null) {
-            return null;
-        }
-
-        return addSearch(search, cacheList, newItem, reason);
-    }
-
-    public cgSearch addSearch(final cgSearch search, final List<cgCache> cacheList, final boolean newItem, final int reason) {
+    public void addSearch(final List<cgCache> cacheList, final int reason) {
         if (CollectionUtils.isEmpty(cacheList)) {
-            return null;
+            return;
         }
 
         if (storage == null) {
             storage = new cgData(this);
         }
-        if (newItem) {
-            // save only newly downloaded data
-            for (final cgCache cache : cacheList) {
-                cache.setReason(reason);
-                storeWithMerge(cache, false);
-            }
-        }
 
-        return search;
+        for (final cgCache cache : cacheList) {
+            cache.setReason(reason);
+            storeWithMerge(cache, false);
+        }
     }
 
     public boolean addCacheToSearch(cgSearch search, cgCache cache) {
diff --git a/main/src/cgeo/geocaching/connector/GCConnector.java b/main/src/cgeo/geocaching/connector/GCConnector.java
index f86aa28..7042d9c 100644
--- a/main/src/cgeo/geocaching/connector/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/GCConnector.java
@@ -15,7 +15,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import android.util.Log;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class GCConnector extends AbstractConnector implements IConnector {
@@ -91,16 +90,8 @@ public class GCConnector extends AbstractConnector implements IConnector {
 
                     geocode = app.getGeocode(guid);
                 }
-
-                final List<cgCache> cacheList = new ArrayList<cgCache>();
-                cacheList.add(app.getCacheByGeocode(geocode));
                 search.addGeocode(geocode);
                 search.error = null;
-
-                app.addSearch(search, cacheList, false, reason);
-
-                cacheList.clear();
-
                 return search;
             }
 
@@ -118,14 +109,14 @@ public class GCConnector extends AbstractConnector implements IConnector {
                 search.url = caches.url;
             }
 
-            app.addSearch(search, null, true, reason);
+            app.addSearch(null, reason);
 
             Log.e(Settings.tag, "cgeoBase.searchByGeocode: No cache parsed");
             return null;
         }
 
         final List<cgCache> cacheList = cgBase.filterSearchResults(search, caches, false, false, null);
-        app.addSearch(search, cacheList, true, reason);
+        app.addSearch(cacheList, reason);
 
         return search;
     }
diff --git a/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java b/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java
index 8660d2a..f973181 100644
--- a/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java
+++ b/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java
@@ -46,7 +46,7 @@ public class ApiOpenCachingConnector extends OpenCachingConnector implements ICo
         caches.cacheList.add(cache);
 
         final List<cgCache> cacheList = cgBase.filterSearchResults(search, caches, false, false, null);
-        app.addSearch(search, cacheList, true, reason);
+        app.addSearch(cacheList, reason);
 
         return search;
     }
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index fb1f01e..285ef6e 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -702,7 +702,8 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory
                 for (cgCache cache : caches) {
                     search.addGeocode(cache.getGeocode());
                 }
-                cgeocaches.startActivityMap(activity, app.addSearch(search, caches, true, 0));
+                app.addSearch(caches, 0);
+                cgeocaches.startActivityMap(activity, search);
                 return true;
             }
             default: