1 files changed, 11 insertions, 12 deletions

diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index 830d61a..c38d5ea 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -37,9 +37,8 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
     private static final int MENU_NAVIGATION = 3;
     private static final int MENU_DEFAULT_NAVIGATION = 2;
     private static final int MENU_SHOW_IN_BROWSER = 7;
-    protected static final String EXTRA_GEOCODE = "geocode";
 
-    protected cgCache cache = null;
+    protected Geocache cache = null;
     protected String geocode = null;
     protected CacheDetailsCreator details;
 
@@ -73,7 +72,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
         }
     };
 
-    public AbstractPopupActivity(String helpTopic, int layout) {
+    protected AbstractPopupActivity(String helpTopic, int layout) {
         super(helpTopic);
         this.layout = layout;
     }
@@ -109,7 +108,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
     }
 
     protected void init() {
-        cache = app.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
+        cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
 
         if (cache == null) {
             showToast(res.getString(R.string.err_detail_cache_find));
@@ -118,7 +117,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
             return;
         }
 
-        geocode = cache.getGeocode().toUpperCase();
+        geocode = cache.getGeocode();
     }
 
     private void showInBrowser() {
@@ -137,7 +136,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
         // get parameters
         final Bundle extras = getIntent().getExtras();
         if (extras != null) {
-            geocode = extras.getString(EXTRA_GEOCODE);
+            geocode = extras.getString(Intents.EXTRA_GEOCODE);
         }
 
         if (StringUtils.isBlank(geocode)) {
@@ -186,10 +185,10 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
             case MENU_SHOW_IN_BROWSER:
                 showInBrowser();
                 return true;
-        }
-
-        if (LoggingUI.onMenuItemSelected(item, this, cache)) {
-            return true;
+            default:
+                if (LoggingUI.onMenuItemSelected(item, this, cache)) {
+                    return true;
+                }
         }
 
         return true;
@@ -251,7 +250,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
         final String cacheSize = cache.getSize() != CacheSize.UNKNOWN ? " (" + cache.getSize().getL10n() + ")" : "";
         details.add(R.string.cache_type, cacheType + cacheSize);
 
-        details.add(R.string.cache_geocode, cache.getGeocode().toUpperCase());
+        details.add(R.string.cache_geocode, cache.getGeocode());
         details.addCacheState(cache);
 
         details.addDistance(cache, cacheDistance);
@@ -276,7 +275,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
 
             @Override
             public void onClick(View arg0) {
-                CacheDetailActivity.startActivity(AbstractPopupActivity.this, geocode.toUpperCase());
+                CacheDetailActivity.startActivity(AbstractPopupActivity.this, geocode);
                 finish();
             }
         });