aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/apps/cache
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2012-06-11 11:29:22 +0200
committerSamuel Tardieu <sam@rfc1149.net>2012-06-11 11:29:22 +0200
commit0dd4bd74af1b1e2a871616ffd8b9416960656a46 (patch)
tree0ea6583af57afb4c6d809ba891ba79f50269aaef /main/src/cgeo/geocaching/apps/cache
parent4e64657dc74e9a10d8264b5f26f1e21c0101a85f (diff)
parentbbc713d01b655870ffdd35941bdd0b3395e09210 (diff)
downloadcgeo-0dd4bd74af1b1e2a871616ffd8b9416960656a46.zip
cgeo-0dd4bd74af1b1e2a871616ffd8b9416960656a46.tar.gz
cgeo-0dd4bd74af1b1e2a871616ffd8b9416960656a46.tar.bz2
Merge remote-tracking branch 'campbeb/fix315' into upstream
Diffstat (limited to 'main/src/cgeo/geocaching/apps/cache')
-rw-r--r--main/src/cgeo/geocaching/apps/cache/navi/CompassApp.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/CompassApp.java b/main/src/cgeo/geocaching/apps/cache/navi/CompassApp.java
index da3d5f9..5275d53 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/CompassApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/CompassApp.java
@@ -6,6 +6,7 @@ import cgeo.geocaching.cgWaypoint;
import cgeo.geocaching.cgeonavigate;
import cgeo.geocaching.apps.AbstractApp;
import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.ui.Formatter;
import android.app.Activity;
@@ -27,7 +28,8 @@ class CompassApp extends AbstractApp implements CacheNavigationApp, WaypointNavi
@Override
public void navigate(Activity activity, cgWaypoint waypoint) {
- cgeonavigate.startActivity(activity, waypoint.getPrefix() + "/" + waypoint.getLookup(), waypoint.getName(), waypoint.getCoords(), null);
+ cgeonavigate.startActivity(activity, waypoint.getPrefix() + "/" + waypoint.getLookup(), waypoint.getName(), waypoint.getCoords(), null,
+ waypoint.getWaypointType().getL10n());
}
@Override
@@ -37,7 +39,8 @@ class CompassApp extends AbstractApp implements CacheNavigationApp, WaypointNavi
@Override
public void navigate(Activity activity, cgCache cache) {
- cgeonavigate.startActivity(activity, cache.getGeocode(), cache.getName(), cache.getCoords(), null);
+ cgeonavigate.startActivity(activity, cache.getGeocode(), cache.getName(), cache.getCoords(), null,
+ Formatter.formatCacheInfoShort(cache));
}
@Override