Merge remote-tracking branch 'origin/release'

Conflicts:
	main/res/values/strings.xml
	main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java

1 files changed, 2 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java b/main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java
index 2c6a8fc..b203aeb 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java
@@ -1,9 +1,8 @@
 package cgeo.geocaching.apps.cache.navi;
 
+import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.Geocache;
-import cgeo.geocaching.apps.AbstractApp;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.GeopointFormatter.Format;
 
@@ -12,7 +11,7 @@ import android.content.Intent;
 
 import java.util.ArrayList;
 
-class RMapsApp extends AbstractApp implements CacheNavigationApp, WaypointNavigationApp, GeopointNavigationApp {
+class RMapsApp extends AbstractPointNavigationApp {
 
     private static final String INTENT = "com.robert.maps.action.SHOW_POINTS";
 
@@ -34,11 +33,6 @@ class RMapsApp extends AbstractApp implements CacheNavigationApp, WaypointNaviga
     }
 
     @Override
-    public boolean isEnabled(Waypoint waypoint) {
-        return waypoint.getCoords() != null;
-    }
-
-    @Override
     public void navigate(Activity activity, Geocache cache) {
         navigate(activity, cache.getCoords(), cache.getGeocode(), cache.getName());
     }