diff options
| -rw-r--r-- | main/src/cgeo/geocaching/LogCacheActivity.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/main/src/cgeo/geocaching/LogCacheActivity.java b/main/src/cgeo/geocaching/LogCacheActivity.java index 4d2815b..0f65a1d 100644 --- a/main/src/cgeo/geocaching/LogCacheActivity.java +++ b/main/src/cgeo/geocaching/LogCacheActivity.java @@ -65,7 +65,6 @@ public class LogCacheActivity extends AbstractLoggingActivity implements DateDia private LayoutInflater inflater = null; private Geocache cache = null; - private String cacheid = null; private String geocode = null; private String text = null; private List<LogType> possibleLogTypes = new ArrayList<LogType>(); @@ -231,15 +230,13 @@ public class LogCacheActivity extends AbstractLoggingActivity implements DateDia // Get parameters from intent and basic cache information from database final Bundle extras = getIntent().getExtras(); if (extras != null) { - cacheid = extras.getString(EXTRAS_ID); geocode = extras.getString(EXTRAS_GEOCODE); - } - - if ((StringUtils.isBlank(cacheid)) && StringUtils.isNotBlank(geocode)) { - cacheid = DataStore.getCacheidForGeocode(geocode); - } - if (StringUtils.isBlank(geocode) && StringUtils.isNotBlank(cacheid)) { - geocode = DataStore.getGeocodeForGuid(cacheid); + if (StringUtils.isBlank(geocode)) { + final String cacheid = extras.getString(EXTRAS_ID); + if (StringUtils.isNotBlank(cacheid)) { + geocode = DataStore.getGeocodeForGuid(cacheid); + } + } } cache = DataStore.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB); |