1 files changed, 10 insertions, 21 deletions
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java b/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java
index ff61404..213e806 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java
@@ -8,13 +8,13 @@ import cgeo.geocaching.cgCache;
 import cgeo.geocaching.cgWaypoint;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.activity.ActivityMixin;
-import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.apps.AbstractApp;
 
 import org.apache.commons.lang3.StringUtils;
 
 import android.app.Activity;
 
-abstract class AbstractStaticMapsApp extends AbstractNavigationApp {
+abstract class AbstractStaticMapsApp extends AbstractApp implements CacheNavigationApp, WaypointNavigationApp {
     public AbstractStaticMapsApp(String name) {
         super(name, null);
     }
@@ -25,27 +25,23 @@ abstract class AbstractStaticMapsApp extends AbstractNavigationApp {
     }
 
     protected static boolean hasStaticMap(cgCache cache) {
-        if (cache != null) {
-            String geocode = cache.getGeocode();
-            if (StringUtils.isNotEmpty(geocode) && cgeoapplication.getInstance().isOffline(geocode, null)) {
-                return StaticMapsProvider.doesExistStaticMapForCache(geocode);
-            }
+        String geocode = cache.getGeocode();
+        if (StringUtils.isNotEmpty(geocode) && cgeoapplication.getInstance().isOffline(geocode, null)) {
+            return StaticMapsProvider.hasStaticMapForCache(geocode);
         }
         return false;
     }
 
     protected static boolean hasStaticMap(cgWaypoint waypoint) {
-        if (waypoint != null) {
-            String geocode = waypoint.getGeocode();
-            int id = waypoint.getId();
-            if (StringUtils.isNotEmpty(geocode) && cgeoapplication.getInstance().isOffline(geocode, null)) {
-                return StaticMapsProvider.doesExistStaticMapForWaypoint(geocode, id);
-            }
+        String geocode = waypoint.getGeocode();
+        int id = waypoint.getId();
+        if (StringUtils.isNotEmpty(geocode) && cgeoapplication.getInstance().isOffline(geocode, null)) {
+            return StaticMapsProvider.hasStaticMapForWaypoint(geocode, id);
         }
         return false;
     }
 
-    protected static boolean invoke(final Activity activity, final cgCache cache, final cgWaypoint waypoint, final boolean download) {
+    protected static boolean invokeStaticMaps(final Activity activity, final cgCache cache, final cgWaypoint waypoint, final boolean download) {
         final ILogable logable = cache != null && cache.getListId() != 0 ? cache : waypoint;
         final String geocode = logable.getGeocode().toUpperCase();
         if (geocode == null) {
@@ -56,11 +52,4 @@ abstract class AbstractStaticMapsApp extends AbstractNavigationApp {
         StaticMapsActivity.startActivity(activity, geocode, download, waypoint);
         return true;
     }
-
-
-    @Override
-    public boolean isEnabled(Geopoint geopoint) {
-        return false;
-    }
-
 }