fix #4669: fix toast if no hint available

3 files changed, 10 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/CompassActivity.java b/main/src/cgeo/geocaching/CompassActivity.java
index 0c1aa49..d481d58 100644
--- a/main/src/cgeo/geocaching/CompassActivity.java
+++ b/main/src/cgeo/geocaching/CompassActivity.java
@@ -209,7 +209,7 @@ public class CompassActivity extends AbstractActionBarActivity {
                 setTarget(cache);
                 return true;
             case R.id.menu_hint:
-                showHint();
+                cache.showHintToast(this);
                 return true;
             default:
                 if (LoggingUI.onMenuItemSelected(item, this, cache)) {
@@ -226,11 +226,6 @@ public class CompassActivity extends AbstractActionBarActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    private void showHint() {
-        final String hint = cache.getHint();
-        showToast(StringUtils.defaultString(hint, getString(R.string.cache_hint_not_available)));
-    }
-
     private void setTarget(@NonNull final Geopoint coords, final String newDescription) {
         setDestCoords(coords);
         setTargetDescription(newDescription);
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index e47730b..9d4e1b2 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -1805,4 +1805,12 @@ public class Geocache implements IWaypoint {
         return geocodes;
     }
 
+    /**
+     * Show the hint as toast message. If no hint is available, a default "no hint available" will be shown instead.
+     */
+    public void showHintToast(final Activity activity) {
+        final String hint = getHint();
+        ActivityMixin.showToast(activity, StringUtils.defaultIfBlank(hint, activity.getString(R.string.cache_hint_not_available)));
+    }
+
 }
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 467a02f..4e08311 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -788,8 +788,7 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
             }
             case R.id.menu_hint:
                 if (caches.size() == 1) {
-                    final String hint = caches.iterator().next().getHint();
-                    ActivityMixin.showToast(getActivity(), StringUtils.defaultString(hint, getActivity().getString(R.string.cache_hint_not_available)));
+                    caches.iterator().next().showHintToast(getActivity());
                 }
                 return true;
             default: