2 files changed, 8 insertions, 8 deletions
diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java
index cf279c0..d5cbb13 100644
--- a/main/src/cgeo/geocaching/StaticMapsProvider.java
+++ b/main/src/cgeo/geocaching/StaticMapsProvider.java
@@ -11,8 +11,8 @@ import cgeo.geocaching.utils.FileUtils;
 import cgeo.geocaching.utils.Log;
 
 import ch.boye.httpclientandroidlib.HttpResponse;
-
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jdt.annotation.NonNull;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -245,11 +245,8 @@ public final class StaticMapsProvider {
      * @param cache
      * @return <code>true</code> if at least one map file exists; <code>false</code> otherwise
      */
-    public static boolean hasStaticMap(final Geocache cache) {
-        if (cache == null) {
-            return false;
-        }
-        final String geocode = cache.getGeocode();
+    public static boolean hasStaticMap(@NonNull final Geocache cache) {
+       final String geocode = cache.getGeocode();
         if (StringUtils.isBlank(geocode)) {
             return false;
         }
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
index eea0f0a..c10da58 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
@@ -16,6 +16,8 @@ import cgeo.geocaching.apps.cache.navi.GoogleNavigationApp.GoogleNavigationWalki
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.settings.Settings;
 
+import org.eclipse.jdt.annotation.Nullable;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -273,7 +275,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
         return menuItem != null;
     }
 
-    private static void navigateCache(Activity activity, Geocache cache, App app) {
+    private static void navigateCache(Activity activity, Geocache cache, @Nullable App app) {
         if (app instanceof CacheNavigationApp) {
             final CacheNavigationApp cacheApp = (CacheNavigationApp) app;
             cacheApp.navigate(activity, cache);
@@ -286,7 +288,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
         return menuItem != null;
     }
 
-    private static void navigateWaypoint(Activity activity, Waypoint waypoint, App app) {
+    private static void navigateWaypoint(Activity activity, Waypoint waypoint, @Nullable App app) {
         if (app instanceof WaypointNavigationApp) {
             final WaypointNavigationApp waypointApp = (WaypointNavigationApp) app;
             waypointApp.navigate(activity, waypoint);
@@ -300,6 +302,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
         }
     }
 
+    @Nullable
     private static App getAppFromMenuItem(MenuItem item) {
         final int id = item.getItemId();
         for (final NavigationAppsEnum navApp : NavigationAppsEnum.values()) {