return to former behavior: POI/FAV/WPT list will not autoatically be displayed on dialogue startup, even if ANNOUNCE enabled in settings

This commit is contained in:
sonora 2014-09-11 00:53:00 +02:00
parent 866f0aed07
commit 738ac9803c

View file

@ -228,32 +228,14 @@ public class WaypointHelper {
if(type == ALARMS) {
return showAlarms() || announceAlarms();
} else if (type == POI) {
//sync SHOW (which has no item in nav settings) to automatically load points in the dialogue
if (announcePOI()) {
app.getSettings().SHOW_NEARBY_POI.set(true);
} else {
app.getSettings().SHOW_NEARBY_POI.set(false);
}
//no SHOW item in nav settings, hence only query ANNOUNCE here (makes inital Waypoint dialogue consistent with nav settings)
//return showPOI() || announcePOI();
return announcePOI();
} else if (type == FAVORITES) {
//sync SHOW (which has no item in nav settings) to automatically load points in the dialogue
if (announceFavorites()) {
app.getSettings().SHOW_NEARBY_FAVORITES.set(true);
} else {
app.getSettings().SHOW_NEARBY_FAVORITES.set(false);
}
//no SHOW item in nav settings, hence only query ANNOUNCE here (makes inital Waypoint dialogue consistent with nav settings)
//return showFavorites() || announceFavorites();
return announceFavorites();
} else if (type == WAYPOINTS) {
//sync SHOW (which has no item in nav settings) to automatically load points in the dialogue
if (announceGPXWaypoints()) {
app.getSettings().SHOW_WPT.set(true);
} else {
app.getSettings().SHOW_WPT.set(false);
}
//no SHOW item in nav settings, hence only query ANNOUNCE here (makes inital Waypoint dialogue consistent with nav settings)
//return showGPXWaypoints() || announceGPXWaypoints();
return announceGPXWaypoints();