Database handling changes. Fixes #1050 and #1076

3 files changed, 4 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index ea90e5d..7caa480 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -802,7 +802,7 @@ public class cgBase {
                         }
                     }
                 } else {
-                    Log.w(Settings.tag, "There are no caches in viewport. Probably the viewport is to big");
+                    Log.w(Settings.tag, "There are no caches in viewport. Probably the viewport is too big");
                 }
                 searchResult.totalCnt = searchResult.getGeocodes().size();
             }
@@ -1474,7 +1474,7 @@ public class cgBase {
      *            if not null, the application to use to save the trackable
      * @return the parsed trackable, or null if none could be parsed
      */
-    public static cgTrackable parseTrackable(final String page, cgeoapplication app, final String possibleTrackingcode) {
+    public static cgTrackable parseTrackable(final String page, final cgeoapplication app, final String possibleTrackingcode) {
         if (StringUtils.isBlank(page)) {
             Log.e(Settings.tag, "cgeoBase.parseTrackable: No page given");
             return null;
diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java
index 4a77524..4de8e50 100644
--- a/main/src/cgeo/geocaching/cgeo.java
+++ b/main/src/cgeo/geocaching/cgeo.java
@@ -776,10 +776,6 @@ public class cgeo extends AbstractActivity {
                 updateUserInfoHandler.sendEmptyMessage(-1);
             }
 
-            // TODO blafoo remove
-            // cgeoapplication.getInstance().cleanDatabase(true);
-            // Settings.setDebugInfos(true);
-
             if (app.showLoginToast) {
                 firstLoginHandler.sendMessage(firstLoginHandler.obtainMessage(0, status));
                 app.showLoginToast = false;
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 62b0f09..cc8ed37 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -1161,7 +1161,7 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory
                     return;
                 }
 
-                caches = search.getCachesFromSearchResult(LoadFlags.LOADWAYPOINTS);
+                caches.addAll(search.getCachesFromSearchResult(LoadFlags.LOADWAYPOINTS));
 
                 //if in live map and stored caches are found / disables are also shown.
                 if (live && Settings.isLiveMap()) {
@@ -1289,7 +1289,7 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory
                 }
 
                 if (search != null) {
-                    caches = search.getCachesFromSearchResult(LoadFlags.LOADCACHEORDB);
+                    caches.addAll(search.getCachesFromSearchResult(LoadFlags.LOADCACHEORDB));
                 }
 
                 if (stop) {