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

Merge pull request #5822 from osmandapp/js_voice_routing

Browse source 
Made ogg voice guidance backward-compatible
This commit is contained in:
vshcherb 2018-08-10 16:42:58 +02:00 committed by GitHub
commit 653d4e44d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java
View file

@ -43,6 +43,7 @@ import net.osmand.plus.helpers.GpxUiHelper;
import net.osmand.plus.routing.RouteProvider;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.MapControlsLayer;
import net.osmand.plus.voice.MediaCommandPlayerImpl;
import net.osmand.router.GeneralRouter;
import net.osmand.router.GeneralRouter.RoutingParameter;
import net.osmand.util.Algorithms;
@ -339,7 +340,7 @@ public class RoutePreferencesMenu {
if (extStorage.exists()) {
for (File f : extStorage.listFiles()) {
if (f.isDirectory()) {
if (addJS && hasJavaScript(f)) {
if ((addJS && hasJavaScript(f)) || MediaCommandPlayerImpl.isMyData(f)) {
setFiles.add(f.getName());
} else if (!addJS) {
setFiles.add(f.getName());

3
OsmAnd/src/net/osmand/plus/voice/JSMediaCommandPlayerImpl.java
View file

@ -90,6 +90,9 @@ public class JSMediaCommandPlayerImpl extends MediaCommandPlayerImpl {
}
public static boolean isMyData(File voiceDir) {
if (voiceDir.getName().contains("tts")) {
return false;
}
for (File f : voiceDir.listFiles()) {
if (f.getName().endsWith(IndexConstants.TTSVOICE_INDEX_EXT_JS)) {
return true;

3
OsmAnd/src/net/osmand/plus/voice/JSTTSCommandPlayerImpl.java
View file

@ -323,8 +323,7 @@ public class JSTTSCommandPlayerImpl extends AbstractJSCommandPlayer {
}
public static boolean isMyData(File voiceDir) {
boolean isTTS = voiceDir.getName().contains("tts");
if (!isTTS) {
if (!voiceDir.getName().contains("tts")) {
return false;
}
for (File f : voiceDir.listFiles()) {