aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
authorrsudev <rasch@munin-soft.de>2012-02-21 22:01:24 +0100
committerrsudev <rasch@munin-soft.de>2012-02-21 22:01:24 +0100
commit009c9575e84379612a710955436f703c7a27bdbc (patch)
tree32073ad939a42325937046aa2ec156ffe40e9104 /main/src
parent61b3c7758e4602495c8f356a832a10b2a4e59a2d (diff)
downloadcgeo-009c9575e84379612a710955436f703c7a27bdbc.zip
cgeo-009c9575e84379612a710955436f703c7a27bdbc.tar.gz
cgeo-009c9575e84379612a710955436f703c7a27bdbc.tar.bz2
Get geocode from wayoint fro clearing CachesCache if necessary, fixes
#1154
Diffstat (limited to 'main/src')
-rw-r--r--main/src/cgeo/geocaching/cgeowaypoint.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/cgeowaypoint.java b/main/src/cgeo/geocaching/cgeowaypoint.java
index 04c0d13..84eac46 100644
--- a/main/src/cgeo/geocaching/cgeowaypoint.java
+++ b/main/src/cgeo/geocaching/cgeowaypoint.java
@@ -312,8 +312,14 @@ public class cgeowaypoint extends AbstractActivity {
public void onClick(View arg0) {
if (app.deleteWaypoint(id)) {
- StaticMapsProvider.removeWpStaticMaps(id, geocode);
- app.removeCache(geocode, EnumSet.of(RemoveFlag.REMOVE_CACHE));
+ String tmpCode = geocode;
+ if (StringUtils.isEmpty(tmpCode)) {
+ tmpCode = waypoint.getGeocode();
+ }
+ StaticMapsProvider.removeWpStaticMaps(id, tmpCode);
+ if (!StringUtils.isEmpty(tmpCode)) {
+ app.removeCache(tmpCode, EnumSet.of(RemoveFlag.REMOVE_CACHE));
+ }
finish();
return;