drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] fix crash when no TTS engine

Browse Source 
Signed-off-by: gekeleda <git@davidgekeler.eu>
This commit is contained in:
gekeleda
2025-12-09 22:19:16 +01:00
committed by x7z4w
parent 4a96d219f0
commit db888f33c5
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/app/src/main/java/app/organicmaps/MwmActivity.java
View File

@@ -1818,9 +1818,17 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (Config.isTtsMessageDelivered()) if (Config.isTtsMessageDelivered())
return; return;
String languageDisplayName = TtsPlayer.INSTANCE.getLanguageDisplayName();
if (languageDisplayName != null)
{
String navigationStartMessage = getResources().getString(R.string.navigation_start_tts_message); String navigationStartMessage = getResources().getString(R.string.navigation_start_tts_message);
navigationStartMessage += TtsPlayer.INSTANCE.getLanguageDisplayName(); navigationStartMessage += languageDisplayName;
Toast.makeText(this, navigationStartMessage, Toast.LENGTH_LONG).show(); Toast.makeText(this, navigationStartMessage, Toast.LENGTH_LONG).show();
}
else
Toast.makeText(this, getResources().getString(R.string.navigation_start_tts_disabled_message), Toast.LENGTH_LONG)
.show();
Config.setTtsMessageDelivered(); Config.setTtsMessageDelivered();
} }

1
android/app/src/main/res/values/strings.xml
View File

@@ -934,6 +934,7 @@
<string name="delete_track_dialog_title">Delete %s?</string> <string name="delete_track_dialog_title">Delete %s?</string>
<string name="pref_tts_no_system_tts_short">No text-to-speech engine found, check the app settings</string> <string name="pref_tts_no_system_tts_short">No text-to-speech engine found, check the app settings</string>
<string name="navigation_start_tts_message">"Starting Navigation, voice instruction language: "</string> <string name="navigation_start_tts_message">"Starting Navigation, voice instruction language: "</string>
<string name="navigation_start_tts_disabled_message">"Voice instructions disabled: TTS engine not available"</string>
<string name="unknown_power_output">unknown</string> <string name="unknown_power_output">unknown</string>
<string name="charge_socket_type2">Type 2 (no cable)</string> <string name="charge_socket_type2">Type 2 (no cable)</string>
<string name="charge_socket_type2_cable">Type 2 (w/ cable)</string> <string name="charge_socket_type2_cable">Type 2 (w/ cable)</string>

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

@@ -10,6 +10,7 @@ import android.os.Looper;
import android.provider.Settings; import android.provider.Settings;
import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech;
import android.speech.tts.UtteranceProgressListener; import android.speech.tts.UtteranceProgressListener;
import android.speech.tts.Voice;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Pair; import android.util.Pair;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -280,13 +281,16 @@ public enum TtsPlayer
public Locale getVoiceLocale() public Locale getVoiceLocale()
{ {
return mTts.getVoice().getLocale(); if (INSTANCE.mTts == null)
return null;
Voice voice = INSTANCE.mTts.getVoice();
return voice != null ? voice.getLocale() : null;
} }
public String getLanguageDisplayName() public String getLanguageDisplayName()
{ {
Locale locale = getVoiceLocale(); Locale locale = getVoiceLocale();
return locale.getDisplayName(locale); return locale != null ? locale.getDisplayName(locale) : null;
} }
public void speak(String textToSpeak) public void speak(String textToSpeak)