refactoring: set totalCount of searches on creation (better

encapsulation)

3 files changed, 8 insertions, 15 deletions

diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index 1cd4e1a..96940f9 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -1819,18 +1819,7 @@ public class cgBase {
     }
 
     public static SearchResult searchByOffline(final Geopoint coords, final CacheType cacheType, final int list) {
-        cgeoapplication app = cgeoapplication.getInstance();
-        final SearchResult search = app.getBatchOfStoredCaches(true, coords, cacheType, list);
-        search.totalCnt = app.getAllStoredCachesCount(true, cacheType, list);
-        return search;
-    }
-
-    public static SearchResult searchByHistory(final CacheType cacheType) {
-        final cgeoapplication app = cgeoapplication.getInstance();
-        final SearchResult search = app.getHistoryOfCaches(true, cacheType);
-        search.totalCnt = app.getAllHistoricCachesCount();
-
-        return search;
+        return cgeoapplication.getInstance().getBatchOfStoredCaches(true, coords, cacheType, list);
     }
 
     /**
diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java
index 5518a4a..f4bead9 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/cgeoapplication.java
@@ -376,7 +376,9 @@ public class cgeoapplication extends Application {
 
     public SearchResult getBatchOfStoredCaches(final boolean detailedOnly, final Geopoint coords, final CacheType cacheType, final int list) {
         final List<String> geocodes = storage.loadBatchOfStoredGeocodes(detailedOnly, coords, cacheType, list);
-        return new SearchResult(geocodes);
+        final SearchResult search = new SearchResult(geocodes);
+        search.totalCnt = getAllStoredCachesCount(true, cacheType, list);
+        return search;
     }
 
     public List<cgDestination> getHistoryOfSearchedLocations() {
@@ -385,7 +387,9 @@ public class cgeoapplication extends Application {
 
     public SearchResult getHistoryOfCaches(final boolean detailedOnly, final CacheType cacheType) {
         final List<String> geocodes = storage.loadBatchOfHistoricGeocodes(detailedOnly, cacheType);
-        return new SearchResult(geocodes);
+        final SearchResult search = new SearchResult(geocodes);
+        search.totalCnt = getAllHistoricCachesCount();
+        return search;
     }
 
     public SearchResult getCachedInViewport(final Long centerLat, final Long centerLon, final Long spanLat, final Long spanLon, final CacheType cacheType) {
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 4b38576..05fd6b7 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -1745,7 +1745,7 @@ public class cgeocaches extends AbstractListActivity {
 
         @Override
         public void run() {
-            search = cgBase.searchByHistory(coords != null ? Settings.getCacheType() : CacheType.ALL);
+            search = cgeoapplication.getInstance().getHistoryOfCaches(true, coords != null ? Settings.getCacheType() : CacheType.ALL);
             handler.sendMessage(new Message());
         }
     }