drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-08 21:37:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Improve TTS selection logging

Browse Source 
Signed-off-by: gekeleda <git@davidgekeler.eu>
This commit is contained in:
gekeleda
2025-09-26 13:04:23 +02:00
committed by Konstantin Pastbin
parent 1cfbc1a8be
commit 593561bc06
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
android/sdk/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
View File

@@ -348,28 +348,39 @@ public enum TtsPlayer
if (outList.isEmpty()) if (outList.isEmpty())
{ {
// No supported languages found, lock down TTS :( Logger.d("TtsPlayer", "No supported languages found, lock down TTS :( ");
lockDown(); lockDown();
return null; return null;
} }
LanguageData res = getSelectedLanguage(outList); LanguageData res = getSelectedLanguage(outList);
if (res == null || !res.downloaded) if (res != null && res.downloaded)
// Selected locale is not available or not downloaded
res = getSystemLanguage(outList);
if (res == null || !res.downloaded)
// System locale is not available or not downloaded
res = getDefaultLanguage(outList);
if (res == null || !res.downloaded)
{ {
// Default locale can not be used too Logger.d("TtsPlayer", "Selected locale " + res.internalCode + " is available and downloaded");
Config.TTS.setEnabled(false); return res;
return null;
} }
return res; Logger.d("TtsPlayer", "Selected locale " + Config.TTS.getLanguage() + " is not available or not downloaded, trying system locales...");
res = getSystemLanguage(outList);
if (res != null && res.downloaded)
{
Logger.d("TtsPlayer", "System locale " + res.internalCode + " is available and downloaded");
return res;
}
Logger.d("TtsPlayer", "None of the system locales are available, or they are not downloaded, trying default locale...");
res = getDefaultLanguage(outList);
if (res != null && res.downloaded)
{
Logger.d("TtsPlayer", "Default locale " + res.internalCode + " is available and downloaded");
return res;
}
Logger.d("TtsPlayer", "Default locale " + DEFAULT_LOCALE + " can not be used either, disable TTS :( ");
Config.TTS.setEnabled(false);
return null;
} }
public @NonNull List<LanguageData> refreshLanguages() public @NonNull List<LanguageData> refreshLanguages()