Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
sonora 2014-09-11 00:53:00 +02:00
parent 866f0aed07
commit 738ac9803c
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file

@ -228,32 +228,14 @@ public class WaypointHelper {
if(type == ALARMS) { if(type == ALARMS) {
return showAlarms() || announceAlarms(); return showAlarms() || announceAlarms();
} else if (type == POI) { } 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) //no SHOW item in nav settings, hence only query ANNOUNCE here (makes inital Waypoint dialogue consistent with nav settings)
//return showPOI() || announcePOI(); //return showPOI() || announcePOI();
return announcePOI(); return announcePOI();
} else if (type == FAVORITES) { } 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) //no SHOW item in nav settings, hence only query ANNOUNCE here (makes inital Waypoint dialogue consistent with nav settings)
//return showFavorites() || announceFavorites(); //return showFavorites() || announceFavorites();
return announceFavorites(); return announceFavorites();
} else if (type == WAYPOINTS) { } 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) //no SHOW item in nav settings, hence only query ANNOUNCE here (makes inital Waypoint dialogue consistent with nav settings)
//return showGPXWaypoints() || announceGPXWaypoints(); //return showGPXWaypoints() || announceGPXWaypoints();
return announceGPXWaypoints(); return announceGPXWaypoints();