refactoring: fix lint and findbugs warnings

4 files changed, 12 insertions, 8 deletions

diff --git a/main/res/drawable-hdpi/ic_menu_globe.png b/main/res/drawable-hdpi/ic_menu_globe.png
deleted file mode 100644
index 1c870fe..0000000
--- a/main/res/drawable-hdpi/ic_menu_globe.png
+++ /dev/null
diff --git a/main/res/drawable-ldpi/ic_menu_globe.png b/main/res/drawable-ldpi/ic_menu_globe.png
deleted file mode 100644
index b096a9e..0000000
--- a/main/res/drawable-ldpi/ic_menu_globe.png
+++ /dev/null
diff --git a/main/res/drawable-mdpi/ic_menu_globe.png b/main/res/drawable-mdpi/ic_menu_globe.png
deleted file mode 100644
index cd283ab..0000000
--- a/main/res/drawable-mdpi/ic_menu_globe.png
+++ /dev/null
diff --git a/main/src/cgeo/geocaching/CacheMenuHandler.java b/main/src/cgeo/geocaching/CacheMenuHandler.java
index 42ea8e6..9326a73 100644
--- a/main/src/cgeo/geocaching/CacheMenuHandler.java
+++ b/main/src/cgeo/geocaching/CacheMenuHandler.java
@@ -36,27 +36,31 @@ public class CacheMenuHandler extends AbstractUIFactory {
 
     }
 
-    public static boolean onMenuItemSelected(MenuItem item, CacheMenuHandler.ActivityInterface activity, Geocache cache) {
+    public static boolean onMenuItemSelected(MenuItem item, CacheMenuHandler.ActivityInterface activityInterface, Geocache cache) {
+        assert activityInterface instanceof Activity;
+        final Activity activity = (Activity) activityInterface;
         switch (item.getItemId()) {
             case R.id.menu_default_navigation:
-                activity.navigateTo();
+                activityInterface.navigateTo();
                 return true;
             case R.id.menu_navigate:
-                activity.showNavigationMenu();
+                activityInterface.showNavigationMenu();
                 return true;
             case R.id.menu_caches_around:
-                activity.cachesAround();
+                activityInterface.cachesAround();
                 return true;
             case R.id.menu_show_in_browser:
-                cache.openInBrowser((Activity) activity);
+                cache.openInBrowser(activity);
                 return true;
             case R.id.menu_share:
-                cache.shareCache((Activity) activity, res);
+                cache.shareCache(activity, res);
                 return true;
             case R.id.menu_calendar:
-                addToCalendarWithIntent((Activity) activity, cache);
+                addToCalendarWithIntent(activity, cache);
+                return true;
+            default:
+                return false;
         }
-        return false;
     }
 
     public static void onPrepareOptionsMenu(final Menu menu, final Geocache cache) {