From a47a2abd6a1874522dc84f7ca8ccf67215dd5f3c Mon Sep 17 00:00:00 2001 From: Marco Jacob Date: Thu, 7 Mar 2013 21:13:08 +0100 Subject: fixes #2507 - Waypoints only stored if not existing --- main/src/cgeo/geocaching/StaticMapsActivity.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'main/src/cgeo/geocaching/StaticMapsActivity.java') diff --git a/main/src/cgeo/geocaching/StaticMapsActivity.java b/main/src/cgeo/geocaching/StaticMapsActivity.java index d7cef65..005ee9e 100644 --- a/main/src/cgeo/geocaching/StaticMapsActivity.java +++ b/main/src/cgeo/geocaching/StaticMapsActivity.java @@ -134,7 +134,8 @@ public class StaticMapsActivity extends AbstractActivity { for (int level = 1; level <= 5; level++) { try { if (waypoint_id != null) { - final Bitmap image = StaticMapsProvider.getWaypointMap(geocode, waypoint_id, level); + final Geocache cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB); + final Bitmap image = StaticMapsProvider.getWaypointMap(geocode, cache.getWaypointById(waypoint_id), level); if (image != null) { maps.add(image); } @@ -186,8 +187,10 @@ public class StaticMapsActivity extends AbstractActivity { final Waypoint waypoint = cache.getWaypointById(waypoint_id); if (waypoint != null) { showToast(res.getString(R.string.info_storing_static_maps)); + // refresh always removes old waypoint files + StaticMapsProvider.removeWpStaticMaps(waypoint, geocode); StaticMapsProvider.storeWaypointStaticMap(cache, waypoint, true); - return StaticMapsProvider.hasStaticMapForWaypoint(geocode, waypoint_id); + return StaticMapsProvider.hasStaticMapForWaypoint(geocode, waypoint); } showToast(res.getString(R.string.err_detail_not_load_map_static)); return false; -- cgit v1.1