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

Merge pull request #7771 from osmandapp/preferences_fixes

Browse source 
Settings fixes
This commit is contained in:
max-klaus 2019-10-28 19:46:03 +03:00 committed by GitHub
commit 5558bacc16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -451,7 +451,7 @@ public class OsmandApplication extends MultiDexApplication {
public void initVoiceCommandPlayer(final Activity uiContext, ApplicationMode applicationMode,
boolean warningNoneProvider, Runnable run, boolean showDialog, boolean force) {
String voiceProvider = osmandSettings.VOICE_PROVIDER.get();
String voiceProvider = osmandSettings.VOICE_PROVIDER.getModeValue(applicationMode);
if (voiceProvider == null || OsmandSettings.VOICE_PROVIDER_NOT_USE.equals(voiceProvider)) {
if (warningNoneProvider && voiceProvider == null) {
final AlertDialog.Builder builder = new AlertDialog.Builder(uiContext);

2
OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
View file

@ -720,7 +720,7 @@ public class RouteProvider {
RoutingConfiguration cf = config.build( params.mode.getRoutingProfile(), params.start.hasBearing() ?
params.start.getBearing() / 180d * Math.PI : null,
memoryLimit, paramsR);
if(settings.ENABLE_TIME_CONDITIONAL_ROUTING.get()) {
if(settings.ENABLE_TIME_CONDITIONAL_ROUTING.getModeValue(params.mode)) {
cf.routeCalculationTime = System.currentTimeMillis();
}
return cf;