Merge pull request #129 from rsudev/master

Fix issue #124: Problems in mapview switch

4 files changed, 27 insertions, 3 deletions

diff --git a/src/cgeo/geocaching/googlemaps/googleMapActivity.java b/src/cgeo/geocaching/googlemaps/googleMapActivity.java
index 9679c6f..ed5b33d 100644
--- a/src/cgeo/geocaching/googlemaps/googleMapActivity.java
+++ b/src/cgeo/geocaching/googlemaps/googleMapActivity.java
@@ -95,6 +95,16 @@ public class googleMapActivity extends MapActivity implements ActivityImpl {
 	}
 
 	@Override
+	public void superOnStop() {
+		super.onStop();
+	}
+
+	@Override
+	public void superOnPause() {
+		super.onPause();
+	}
+
+	@Override
 	public boolean superOnPrepareOptionsMenu(Menu menu) {
 		return super.onPrepareOptionsMenu(menu);
 	}
diff --git a/src/cgeo/geocaching/mapcommon/MapBase.java b/src/cgeo/geocaching/mapcommon/MapBase.java
index cd4c12d..1f967a0 100644
--- a/src/cgeo/geocaching/mapcommon/MapBase.java
+++ b/src/cgeo/geocaching/mapcommon/MapBase.java
@@ -1,12 +1,12 @@
 package cgeo.geocaching.mapcommon;
 
-import cgeo.geocaching.mapinterfaces.ActivityImpl;
 import android.app.Activity;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import cgeo.geocaching.mapinterfaces.ActivityImpl;
 
 /**
  * Base class for the map activity. Delegates base class calls to the
@@ -39,11 +39,11 @@ public abstract class MapBase {
 	}
 
 	public void onStop() {
-		mapActivity.superOnResume();
+		mapActivity.superOnStop();
 	}
 
 	public void onPause() {
-		mapActivity.superOnResume();
+		mapActivity.superOnPause();
 	}
 
 	public void onDestroy() {
diff --git a/src/cgeo/geocaching/mapinterfaces/ActivityImpl.java b/src/cgeo/geocaching/mapinterfaces/ActivityImpl.java
index 12f00e9..a3e772c 100644
--- a/src/cgeo/geocaching/mapinterfaces/ActivityImpl.java
+++ b/src/cgeo/geocaching/mapinterfaces/ActivityImpl.java
@@ -25,6 +25,10 @@ public interface ActivityImpl {
 
 	void superOnDestroy();
 
+	void superOnStop();
+
+	void superOnPause();
+
 	boolean superOnCreateOptionsMenu(Menu menu);
 
 	boolean superOnPrepareOptionsMenu(Menu menu);
diff --git a/src/cgeo/geocaching/mapsforge/mfMapActivity.java b/src/cgeo/geocaching/mapsforge/mfMapActivity.java
index 8ff8cc1..f6d2ac3 100644
--- a/src/cgeo/geocaching/mapsforge/mfMapActivity.java
+++ b/src/cgeo/geocaching/mapsforge/mfMapActivity.java
@@ -91,6 +91,16 @@ public class mfMapActivity extends MapActivity implements ActivityImpl {
 	}
 
 	@Override
+	public void superOnStop() {
+		super.onStop();
+	}
+
+	@Override
+	public void superOnPause() {
+		super.onPause();
+	}
+
+	@Override
 	public boolean superOnPrepareOptionsMenu(Menu menu) {
 		return super.onPrepareOptionsMenu(menu);
 	}