diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-11-09 06:51:10 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-11-09 06:51:10 +0100 |
| commit | 9c9650f91a30bd9a481fe84ac249349aeb43c27a (patch) | |
| tree | cfacb7652ef35155c7354122d2f84f000eddb427 /main/src/cgeo | |
| parent | a170e86615c7f49a74c7ed9226eed8b1a9dd0c54 (diff) | |
| download | cgeo-9c9650f91a30bd9a481fe84ac249349aeb43c27a.zip cgeo-9c9650f91a30bd9a481fe84ac249349aeb43c27a.tar.gz cgeo-9c9650f91a30bd9a481fe84ac249349aeb43c27a.tar.bz2 | |
fix #3404: waypoint navigation opened twice
Diffstat (limited to 'main/src/cgeo')
| -rw-r--r-- | main/src/cgeo/geocaching/apps/cache/navi/AbstractPointNavigationApp.java | 13 |
1 files changed, 5 insertions, 8 deletions
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 |