From 9c9650f91a30bd9a481fe84ac249349aeb43c27a Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sat, 9 Nov 2013 06:51:10 +0100
Subject: fix #3404: waypoint navigation opened twice

---
 .../apps/cache/navi/AbstractPointNavigationApp.java         | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'main/src')

diff --git a/main/src/cgeo/geocaching/apps/cache/navi/AbstractPointNavigationApp.java b/main/src/cgeo/geocaching/apps/cache/navi/AbstractPointNavigationApp.java
index 75ea056..a1c752c 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/AbstractPointNavigationApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/AbstractPointNavigationApp.java
@@ -24,7 +24,10 @@ abstract class AbstractPointNavigationApp extends AbstractApp implements CacheNa
 
     @Override
     public void navigate(Activity activity, Geocache cache) {
-        final Geopoint coords = cache.getCoords();
+        navigateWithNullCheck(activity, cache.getCoords());
+    }
+
+    private void navigateWithNullCheck(Activity activity, final Geopoint coords) {
         if (coords != null) {
             navigate(activity, coords);
         } else {
@@ -34,13 +37,7 @@ abstract class AbstractPointNavigationApp extends AbstractApp implements CacheNa
 
     @Override
     public void navigate(Activity activity, Waypoint waypoint) {
-        final Geopoint coords = waypoint.getCoords();
-        if (coords != null) {
-            navigate(activity, coords);
-        } else {
-            ActivityMixin.showToast(activity, activity.getResources().getString(R.string.err_nav_no_coordinates));
-        }
-        navigate(activity, waypoint.getCoords());
+        navigateWithNullCheck(activity, waypoint.getCoords());
     }
 
     @Override
-- 
cgit v1.1