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

fix 2 small bugs with show/speak alarm (main issue not fixed yet, I think)

Browse source
This commit is contained in:
sonora 2014-09-09 12:43:06 +02:00
parent 1bfb8bcec5
commit 632dfeb630
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -523,13 +523,13 @@ public class WaypointHelper {
private void calculateAlarms(RouteCalculationResult route, List<LocationPointWrapper> array) { private void calculateAlarms(RouteCalculationResult route, List<LocationPointWrapper> array) {
for(AlarmInfo i : route.getAlarmInfo()) { for(AlarmInfo i : route.getAlarmInfo()) {
if(i.getType() == AlarmInfoType.SPEED_CAMERA) { if(i.getType() == AlarmInfoType.SPEED_CAMERA) {
if(app.getSettings().SHOW_CAMERAS.get()){ if(app.getSettings().SHOW_CAMERAS.get() || app.getSettings().SPEAK_SPEED_CAMERA.get()){
LocationPointWrapper lw = new LocationPointWrapper(route, ALARMS, i, 0, i.getLocationIndex()); LocationPointWrapper lw = new LocationPointWrapper(route, ALARMS, i, 0, i.getLocationIndex());
lw.setAnnounce(app.getSettings().SPEAK_SPEED_CAMERA.get()); lw.setAnnounce(app.getSettings().SPEAK_SPEED_CAMERA.get());
array.add(lw); array.add(lw);
} }
} else { } else {
if(app.getSettings().SHOW_TRAFFIC_WARNINGS.get()){ if(app.getSettings().SHOW_TRAFFIC_WARNINGS.get() || app.getSettings().SPEAK_TRAFFIC_WARNINGS.get()){
LocationPointWrapper lw = new LocationPointWrapper(route, ALARMS, i, 0, i.getLocationIndex()); LocationPointWrapper lw = new LocationPointWrapper(route, ALARMS, i, 0, i.getLocationIndex());
lw.setAnnounce(app.getSettings().SPEAK_TRAFFIC_WARNINGS.get()); lw.setAnnounce(app.getSettings().SPEAK_TRAFFIC_WARNINGS.get());
array.add(lw); array.add(lw);
@ -591,8 +591,9 @@ public class WaypointHelper {
} }
public boolean showAlarms() { public boolean showAlarms() {
return app.getSettings().SPEAK_SPEED_CAMERA.get() || // I think this line was a bug:
app.getSettings().SPEAK_TRAFFIC_WARNINGS.get(); //return app.getSettings().SPEAK_SPEED_CAMERA.get() || app.getSettings().SPEAK_TRAFFIC_WARNINGS.get();
return app.getSettings().SHOW_CAMERAS.get() || app.getSettings().SHOW_TRAFFIC_WARNINGS.get();
} }
public boolean announceFavorites() { public boolean announceFavorites() {