diff options
| -rw-r--r-- | main/src/cgeo/geocaching/DataStore.java | 29 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/enumerations/LoadFlags.java | 3 |
2 files changed, 0 insertions, 32 deletions
diff --git a/main/src/cgeo/geocaching/DataStore.java b/main/src/cgeo/geocaching/DataStore.java index 3abeff3..962f68f 100644 --- a/main/src/cgeo/geocaching/DataStore.java +++ b/main/src/cgeo/geocaching/DataStore.java @@ -1555,9 +1555,6 @@ public class DataStore { if (loadFlags.contains(LoadFlag.LOAD_DB_MINIMAL) || loadFlags.contains(LoadFlag.LOAD_ATTRIBUTES) || loadFlags.contains(LoadFlag.LOAD_WAYPOINTS) || - loadFlags.contains(LoadFlag.LOAD_SPOILERS) || - loadFlags.contains(LoadFlag.LOAD_LOGS) || - loadFlags.contains(LoadFlag.LOAD_INVENTORY) || loadFlags.contains(LoadFlag.LOAD_OFFLINE_LOG)) { final Set<Geocache> cachesFromDB = loadCachesFromGeocodes(remaining, loadFlags); @@ -1630,32 +1627,6 @@ public class DataStore { } } - if (loadFlags.contains(LoadFlag.LOAD_SPOILERS)) { - final List<Image> spoilers = loadSpoilers(cache.getGeocode()); - cache.setSpoilers(spoilers); - } - - if (loadFlags.contains(LoadFlag.LOAD_LOGS)) { - cache.setLogs(loadLogs(cache.getGeocode())); - final Map<LogType, Integer> logCounts = loadLogCounts(cache.getGeocode()); - if (MapUtils.isNotEmpty(logCounts)) { - cache.getLogCounts().clear(); - cache.getLogCounts().putAll(logCounts); - } - } - - if (loadFlags.contains(LoadFlag.LOAD_INVENTORY)) { - final List<Trackable> inventory = loadInventory(cache.getGeocode()); - if (CollectionUtils.isNotEmpty(inventory)) { - if (cache.getInventory() == null) { - cache.setInventory(new ArrayList<Trackable>()); - } else { - cache.getInventory().clear(); - } - cache.getInventory().addAll(inventory); - } - } - if (loadFlags.contains(LoadFlag.LOAD_OFFLINE_LOG)) { if (logIndex < 0) { logIndex = cursor.getColumnIndex("log"); diff --git a/main/src/cgeo/geocaching/enumerations/LoadFlags.java b/main/src/cgeo/geocaching/enumerations/LoadFlags.java index fb894ac..af274e7 100644 --- a/main/src/cgeo/geocaching/enumerations/LoadFlags.java +++ b/main/src/cgeo/geocaching/enumerations/LoadFlags.java @@ -13,9 +13,6 @@ public interface LoadFlags { LOAD_DB_MINIMAL, // load minimal informations from DataBase LOAD_ATTRIBUTES, LOAD_WAYPOINTS, - LOAD_SPOILERS, - LOAD_LOGS, - LOAD_INVENTORY, LOAD_OFFLINE_LOG } |