mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 12:02:16 +02:00
Code

fix(auto-display-answer): continue if TTS empty

Browse Source 
If the back side of a note is empty, the completion
listener should be called immediately

Fixes 9630
This commit is contained in:
David Allison 2021-10-20 07:16:51 +01:00 committed by Mike Hardy
parent cecd5cc98e
commit 3c1eea86d4
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
AnkiDroid/src/main/java/com/ichi2/anki/ReadText.java
View File

@ -49,13 +49,14 @@ public class ReadText {
private static Sound.SoundSide mQuestionAnswer;
public static final String NO_TTS = "0";
private static final Bundle mTtsParams = new Bundle();
private static ReadTextListener mCompletionListener;
public static Sound.SoundSide getmQuestionAnswer() {
return mQuestionAnswer;
}
public static void speak(String text, String loc, int queueMode) {
private static void speak(String text, String loc, int queueMode) {
int result = mTts.setLanguage(LanguageUtils.localeFromStringIgnoringScriptAndExtensions(loc));
if (result == TextToSpeech.LANG_MISSING_DATA || result == TextToSpeech.LANG_NOT_SUPPORTED) {
UIUtils.showThemedToast(mReviewer.get(), mReviewer.get().getString(R.string.no_tts_available_message)
@ -73,7 +74,7 @@ public class ReadText {
}
public static String getLanguage(long did, int ord, Sound.SoundSide qa) {
private static String getLanguage(long did, int ord, Sound.SoundSide qa) {
return MetaDB.getLanguage(mReviewer.get(), did, ord, qa);
}
@ -156,13 +157,21 @@ public class ReadText {
*/
public static void readCardSide(Sound.SoundSide cardSide, String cardSideContents, long did, int ord, String clozeReplacement) {
boolean isFirstText = true;
boolean playedSound = false;
for (TtsParser.LocalisedText textToRead : TtsParser.getTextsToRead(cardSideContents, clozeReplacement)) {
if (!textToRead.getText().isEmpty()) {
textToSpeech(textToRead.getText(), did, ord, cardSide,
textToRead.getLocaleCode(),
isFirstText ? TextToSpeech.QUEUE_FLUSH : TextToSpeech.QUEUE_ADD);
isFirstText = false;
if (textToRead.getText().isEmpty()) {
continue;
}
textToSpeech(textToRead.getText(), did, ord, cardSide,
textToRead.getLocaleCode(),
isFirstText ? TextToSpeech.QUEUE_FLUSH : TextToSpeech.QUEUE_ADD);
isFirstText = false;
playedSound = true;
}
// if we didn't play a sound, call the completion listener
if (!playedSound) {
mCompletionListener.onDone(cardSide);
}
}
@ -235,6 +244,7 @@ public class ReadText {
public static void initializeTts(Context context, @NonNull ReadTextListener listener) {
// Store weak reference to Activity to prevent memory leak
mReviewer = new WeakReference<>(context);
mCompletionListener = listener;
// Create new TTS object and setup its onInit Listener
mTts = new TextToSpeech(context, status -> {
if (status == TextToSpeech.SUCCESS) {