1 files changed, 13 insertions, 11 deletions

diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index f903d00..4dd9fd1 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -67,14 +67,23 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
                     cacheDistance.setText(Units.getDistanceFromKilometers(geo.getCoords().distanceTo(cache.getCoords())));
                     cacheDistance.bringToFront();
                 }
+                onUpdateGeoData(geo);
             } catch (Exception e) {
                 Log.w("Failed to UpdateLocation location.");
             }
         }
     };
 
-    protected AbstractPopupActivity(String helpTopic, int layout) {
-        super(helpTopic);
+    /**
+     * Callback to run when new location information is available.
+     * This may be overriden by deriving classes. The default implementation does nothing.
+     *
+     * @param geo the new data
+     */
+    public void onUpdateGeoData(final IGeoData geo) {
+    }
+
+    protected AbstractPopupActivity(int layout) {
         this.layout = layout;
     }
 
@@ -102,12 +111,6 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
         }).start();
     }
 
-    @Override
-    public void goManual(View view) {
-        super.goManual(view);
-        finish();
-    }
-
     protected void init() {
         cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
 
@@ -134,7 +137,6 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
         this.setTheme(ActivityMixin.getDialogTheme());
         // set layout
         setContentView(layout);
-        setTitle(res.getString(R.string.detail));
 
         // get parameters
         final Bundle extras = getIntent().getExtras();
@@ -269,8 +271,8 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
             aquireGCVote();
         }
 
-        // favourite count
-        details.add(R.string.cache_favourite, cache.getFavoritePoints() + "×");
+        // favorite count
+        details.add(R.string.cache_favorite, cache.getFavoritePoints() + "×");
 
         // more details
         final Button buttonMore = (Button) findViewById(R.id.more_details);