Finally fix #3597, Radar navigation not working

Corrected side-effects on Pebble app, courtesy @bananeweizen

4 files changed, 18 insertions, 5 deletions

diff --git a/main/src/cgeo/geocaching/apps/cache/navi/AbstractPointNavigationApp.java b/main/src/cgeo/geocaching/apps/cache/navi/AbstractPointNavigationApp.java
index 52ea774..ec9705c 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/AbstractPointNavigationApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/AbstractPointNavigationApp.java
@@ -63,9 +63,4 @@ abstract class AbstractPointNavigationApp extends AbstractApp implements CacheNa
         intent.putExtra("code", cache.getGeocode());
         intent.putExtra("size", cache.getSize().getL10n());
     }
-
-    protected static void addCoordinates(final Intent intent, final Geopoint coords) {
-        intent.putExtra("latitude", (float) coords.getLatitude());
-        intent.putExtra("longitude", (float) coords.getLongitude());
-    }
 }
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/AbstractRadarApp.java b/main/src/cgeo/geocaching/apps/cache/navi/AbstractRadarApp.java
index 862dd34..6c6ffda 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/AbstractRadarApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/AbstractRadarApp.java
@@ -41,4 +41,5 @@ public abstract class AbstractRadarApp extends AbstractPointNavigationApp {
         activity.startActivity(intent);
     }
 
+    protected abstract void addCoordinates(final Intent intent, final Geopoint point);
 }
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/PebbleApp.java b/main/src/cgeo/geocaching/apps/cache/navi/PebbleApp.java
index a398fe2..ac83085 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/PebbleApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/PebbleApp.java
@@ -1,6 +1,9 @@
 package cgeo.geocaching.apps.cache.navi;

 

 import cgeo.geocaching.R;

+import cgeo.geocaching.geopoint.Geopoint;

+

+import android.content.Intent;

 

 /**

  * Application for communication with the Pebble watch.

@@ -15,4 +18,9 @@ class PebbleApp extends AbstractRadarApp {
         super(getString(R.string.cache_menu_pebble), R.id.cache_app_pebble, INTENT, PACKAGE_NAME);

     }

 

+    @Override

+    protected void addCoordinates(final Intent intent, final Geopoint coords) {

+        intent.putExtra("latitude", coords.getLatitude());

+        intent.putExtra("longitude", coords.getLongitude());

+    }

 }
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/RadarApp.java b/main/src/cgeo/geocaching/apps/cache/navi/RadarApp.java
index e5aac6d..41cf2d8 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/RadarApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/RadarApp.java
@@ -1,6 +1,9 @@
 package cgeo.geocaching.apps.cache.navi;
 
 import cgeo.geocaching.R;
+import cgeo.geocaching.geopoint.Geopoint;
+
+import android.content.Intent;
 
 class RadarApp extends AbstractRadarApp {
 
@@ -11,4 +14,10 @@ class RadarApp extends AbstractRadarApp {
         super(getString(R.string.cache_menu_radar), R.id.cache_app_radar, INTENT, PACKAGE_NAME);
     }
 
+    @Override
+    protected void addCoordinates(final Intent intent, final Geopoint coords) {
+        intent.putExtra("latitude", (float) coords.getLatitude());
+        intent.putExtra("longitude", (float) coords.getLongitude());
+    }
+
 }
\ No newline at end of file