aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSammysHP <sven@sammyshp.de>2011-08-20 14:41:37 +0200
committerSammysHP <sven@sammyshp.de>2011-08-20 14:41:37 +0200
commitbab445096e920b16f496eec87bdb656fa740ea71 (patch)
tree9c38142f76aa36e52c7ee10bfc92a7a70973f494
parent8a1e0638b1c86687bd53507721b452b5c2d91480 (diff)
downloadcgeo-bab445096e920b16f496eec87bdb656fa740ea71.zip
cgeo-bab445096e920b16f496eec87bdb656fa740ea71.tar.gz
cgeo-bab445096e920b16f496eec87bdb656fa740ea71.tar.bz2
Fix NullPointerException in cgeodetail if cache is opened from URL only with guid.
-rw-r--r--src/cgeo/geocaching/cgeodetail.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/cgeo/geocaching/cgeodetail.java b/src/cgeo/geocaching/cgeodetail.java
index b6f4cd4..89dea60 100644
--- a/src/cgeo/geocaching/cgeodetail.java
+++ b/src/cgeo/geocaching/cgeodetail.java
@@ -595,9 +595,17 @@ public class cgeodetail extends AbstractActivity {
gcIcons.put("mystery", R.drawable.type_mystery);
}
- geocode = geocode.toUpperCase();
+ if (null == geocode && cache.geocode.length() > 0)
+ {
+ geocode = cache.geocode;
+ }
+
+ if (null == guid && cache.guid.length() > 0)
+ {
+ guid = cache.guid;
+ }
- setTitle(geocode);
+ setTitle(cache.geocode.toUpperCase());
inflater = getLayoutInflater();