diff options
Diffstat (limited to 'main/src/cgeo/geocaching/CacheMenuHandler.java')
| -rw-r--r-- | main/src/cgeo/geocaching/CacheMenuHandler.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/main/src/cgeo/geocaching/CacheMenuHandler.java b/main/src/cgeo/geocaching/CacheMenuHandler.java index 5b0fdba..542f8ef 100644 --- a/main/src/cgeo/geocaching/CacheMenuHandler.java +++ b/main/src/cgeo/geocaching/CacheMenuHandler.java @@ -32,7 +32,7 @@ public class CacheMenuHandler extends AbstractUIFactory { } - public static boolean onMenuItemSelected(MenuItem item, CacheMenuHandler.ActivityInterface activityInterface, Geocache cache) { + public static boolean onMenuItemSelected(final MenuItem item, final CacheMenuHandler.ActivityInterface activityInterface, final Geocache cache) { assert activityInterface instanceof Activity || activityInterface instanceof Fragment; final Activity activity; if (activityInterface instanceof Activity) { @@ -54,9 +54,6 @@ public class CacheMenuHandler extends AbstractUIFactory { case R.id.menu_show_in_browser: cache.openInBrowser(activity); return true; - case R.id.menu_share: - cache.shareCache(activity, res); - return true; case R.id.menu_calendar: CalendarAddon.addToCalendarWithIntent(activity, cache); return true; @@ -66,7 +63,6 @@ public class CacheMenuHandler extends AbstractUIFactory { } public static void onPrepareOptionsMenu(final Menu menu, final Geocache cache) { - // if (cache == null) { return; } @@ -79,21 +75,21 @@ public class CacheMenuHandler extends AbstractUIFactory { menu.findItem(R.id.menu_default_navigation).setTitle(NavigationAppFactory.getDefaultNavigationApplication().getName()); - MenuItem shareItem = menu.findItem(R.id.menu_share); - ShareActionProvider shareActionProvider = (ShareActionProvider) + final MenuItem shareItem = menu.findItem(R.id.menu_share); + final ShareActionProvider shareActionProvider = (ShareActionProvider) MenuItemCompat.getActionProvider(shareItem); if(shareActionProvider != null) { - shareActionProvider.setShareIntent(cache.getIntent()); + shareActionProvider.setShareIntent(cache.getShareIntent()); } } - public static void addMenuItems(MenuInflater inflater, Menu menu, Geocache cache) { + public static void addMenuItems(final MenuInflater inflater, final Menu menu, final Geocache cache) { inflater.inflate(R.menu.cache_options, menu); onPrepareOptionsMenu(menu, cache); } - public static void addMenuItems(Activity activity, Menu menu, Geocache cache) { + public static void addMenuItems(final Activity activity, final Menu menu, final Geocache cache) { addMenuItems(activity.getMenuInflater(), menu, cache); } } |
