From 054cda3500b766846a3a5fc1e6d4f2788f5e5876 Mon Sep 17 00:00:00 2001 From: rsudev Date: Sun, 26 Feb 2012 08:00:10 +0100 Subject: Fixes #1163, refactor geocode usage in cgeowaypoint - removed parameter and member, always taken from contained waypoint --- main/src/cgeo/geocaching/cgeowaypoint.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'main/src/cgeo/geocaching/cgeowaypoint.java') diff --git a/main/src/cgeo/geocaching/cgeowaypoint.java b/main/src/cgeo/geocaching/cgeowaypoint.java index 7fbf14a..aac3005 100644 --- a/main/src/cgeo/geocaching/cgeowaypoint.java +++ b/main/src/cgeo/geocaching/cgeowaypoint.java @@ -32,7 +32,6 @@ public class cgeowaypoint extends AbstractActivity { private static final int MENU_ID_DEFAULT_NAVIGATION = 2; private static final int MENU_ID_OPEN_GEOCACHE = 6; private cgWaypoint waypoint = null; - private String geocode = null; private int id = -1; private ProgressDialog waitDialog = null; private cgGeo geo = null; @@ -147,7 +146,6 @@ public class cgeowaypoint extends AbstractActivity { // try to get data from extras if (extras != null) { id = extras.getInt("waypoint"); - geocode = extras.getString("geocode"); } if (id <= 0) { @@ -239,7 +237,7 @@ public class cgeowaypoint extends AbstractActivity { menu.findItem(MENU_ID_DEFAULT_NAVIGATION).setVisible(visible); menu.findItem(MENU_ID_CACHES_AROUND).setVisible(visible); - boolean openGeocache = StringUtils.isEmpty(geocode) && StringUtils.isNotEmpty(waypoint.getGeocode()); + boolean openGeocache = waypoint != null && StringUtils.isNotEmpty(waypoint.getGeocode()); menu.findItem(MENU_ID_OPEN_GEOCACHE).setVisible(openGeocache); } catch (Exception e) { // nothing @@ -322,13 +320,10 @@ public class cgeowaypoint extends AbstractActivity { public void onClick(View arg0) { if (app.deleteWaypoint(id)) { - 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)); + String geocode = waypoint.getGeocode(); + StaticMapsProvider.removeWpStaticMaps(id, geocode); + if (!StringUtils.isEmpty(geocode)) { + app.removeCache(geocode, EnumSet.of(RemoveFlag.REMOVE_CACHE)); } finish(); -- cgit v1.1