mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-15 08:29:24 +00:00
Code Issues Releases Wiki Activity

Handle TTS completed

Browse source
This commit is contained in:
M66B 2024-08-28 09:25:06 +02:00
parent ad2ac6c3e8
commit 10eba42774
3 changed files with 46 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/EntityRule.java
View file

@ -1313,7 +1313,7 @@ public class EntityRule {
sb.append(context.getString(R.string.title_rule_tts_content))
.append(' ').append(preview);
TTSHelper.speak(context, "rule:" + message.id, sb.toString(), message.language, false);
TTSHelper.speak(context, "rule:" + message.id, sb.toString(), message.language, false, null);
}
private boolean onActionSnooze(Context context, EntityMessage message, JSONObject jargs) throws JSONException {

10
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -3639,7 +3639,7 @@ public class FragmentMessages extends FragmentBase
iProperties.setValue("tts", message.id, !tts);
if (tts) {
TTSHelper.speak(getContext(), "tts:" + message.id, "", message.language, true);
TTSHelper.speak(getContext(), "tts:" + message.id, "", message.language, true, null);
return;
}
@ -3684,7 +3684,13 @@ public class FragmentMessages extends FragmentBase
@Override
protected void onExecuted(Bundle args, String text) {
if (text != null)
TTSHelper.speak(getContext(), "tts:" + message.id, text, message.language, true);
TTSHelper.speak(getContext(), "tts:" + message.id, text, message.language, true,
new Runnable() {
@Override
public void run() {
iProperties.setValue("tts", message.id, false);
}
});
}
@Override

39
app/src/main/java/eu/faircode/email/TTSHelper.java
View file

@ -21,17 +21,21 @@ package eu.faircode.email;
import android.content.Context;
import android.speech.tts.TextToSpeech;
import android.speech.tts.UtteranceProgressListener;
import androidx.annotation.NonNull;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
public class TTSHelper {
private static Integer status = null;
private static TextToSpeech instance = null;
private static List<Runnable> queue = new ArrayList<>();
private static final List<Runnable> queue = new ArrayList<>();
private static final Map<String, Runnable> listeners = new HashMap<>();
private static final Object lock = new Object();
// https://developer.android.com/reference/android/speech/tts/TextToSpeech
@ -42,7 +46,8 @@ public class TTSHelper {
@NonNull final String utteranceId,
@NonNull final String text,
final String language,
final boolean flush) {
final boolean flush,
final Runnable listener) {
Locale locale = (language == null ? Locale.getDefault() : new Locale(language));
@ -64,6 +69,9 @@ public class TTSHelper {
};
synchronized (lock) {
if (listener != null)
listeners.put(utteranceId, listener);
if (status == null) {
queue.add(speak);
if (instance == null)
@ -72,6 +80,33 @@ public class TTSHelper {
instance = new TextToSpeech(context, new TextToSpeech.OnInitListener() {
@Override
public void onInit(int initStatus) {
instance.setOnUtteranceProgressListener(new UtteranceProgressListener() {
@Override
public void onStart(String utteranceId) {
Log.i("TTS start=" + utteranceId);
}
@Override
public void onDone(String utteranceId) {
Log.i("TTS done=" + utteranceId);
report(utteranceId);
}
@Override
public void onError(String utteranceId) {
Log.i("TTS error=" + utteranceId);
report(utteranceId);
}
private void report(String utteranceId) {
synchronized (lock) {
Runnable listener = listeners.remove(utteranceId);
if (listener != null)
ApplicationEx.getMainHandler().post(listener);
}
}
});
synchronized (lock) {
status = initStatus;
boolean ok = (status == TextToSpeech.SUCCESS);