fixes #1725: no static maps apps as default nav app

2 files changed, 20 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java b/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java
index 3716f0c..dacb03f 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java
@@ -24,6 +24,11 @@ abstract class AbstractStaticMapsApp extends AbstractApp implements CacheNavigat
         return true;
     }
 
+    @Override
+    public boolean isDefaultNavigationApp() {
+        return false;
+    }
+
     protected static boolean hasStaticMap(cgCache cache) {
         String geocode = cache.getGeocode();
         if (StringUtils.isNotEmpty(geocode) && cgeoapplication.getInstance().isOffline(geocode, null)) {
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
index cd8fea4..bf0517f 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
@@ -178,6 +178,21 @@ public final class NavigationAppFactory extends AbstractAppFactory {
     }
 
     /**
+     * Returns all installed navigation apps for default navigation.
+     * 
+     * @return
+     */
+    public static List<NavigationAppsEnum> getInstalledDefaultNavigationApps() {
+        final List<NavigationAppsEnum> installedNavigationApps = new ArrayList<NavigationAppsEnum>();
+        for (NavigationAppsEnum appEnum : NavigationAppsEnum.values()) {
+            if (appEnum.app.isInstalled() && appEnum.app.isDefaultNavigationApp()) {
+                installedNavigationApps.add(appEnum);
+            }
+        }
+        return installedNavigationApps;
+    }
+
+    /**
      * This offset is used to build unique menu ids to avoid collisions of ids in menus
      */
     private static final int MENU_ITEM_OFFSET = 12345;