nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Solves NPE when the TextToSpeech engine isn't ready.

Browse Source
This commit is contained in:
Vitor Pamplona
2023-10-23 11:15:33 -04:00
parent 9dfb4d1a1b
commit f92e13270d
2 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechEngine.kt
+24 -22
View File
@@ -49,28 +49,30 @@ class TextToSpeechEngine private constructor() {
fun initTTS(context: Context, message: String) {
tts = TextToSpeech(context) {
if (it == TextToSpeech.SUCCESS) {
tts!!.language = defLanguage
tts!!.setPitch(defaultPitch)
tts!!.setSpeechRate(defaultSpeed)
tts!!.setListener(
onStart = {
onStartListener?.invoke()
},
onError = { e ->
e?.let { error ->
onErrorListener?.invoke(error)
tts?.let {
it.language = defLanguage
it.setPitch(defaultPitch)
it.setSpeechRate(defaultSpeed)
it.setListener(
onStart = {
onStartListener?.invoke()
},
onError = { e ->
e?.let { error ->
onErrorListener?.invoke(error)
}
},
onRange = { start, end ->
if (this@TextToSpeechEngine.message != null) {
onHighlightListener?.invoke(start, end)
}
},
onDone = {
onStartListener?.invoke()
}
},
onRange = { start, end ->
if (this@TextToSpeechEngine.message != null) {
onHighlightListener?.invoke(start, end)
}
},
onDone = {
onStartListener?.invoke()
}
)
speak(message)
)
speak(message)
}
} else {
onErrorListener?.invoke(getErrorText(it))
}
@@ -78,7 +80,7 @@ class TextToSpeechEngine private constructor() {
}
private fun speak(message: String): TextToSpeechEngine {
tts!!.speak(
tts?.speak(
message,
TextToSpeech.QUEUE_FLUSH,
null,
app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechHelper.kt
+11 -11
View File
@@ -21,7 +21,7 @@ class TextToSpeechHelper private constructor(private val context: WeakReference<
private var message: String? = null
private var tts: TextToSpeechEngine? = null
private var ttsEngine: TextToSpeechEngine? = null
private var onStart: (() -> Unit)? = null
@@ -44,19 +44,19 @@ class TextToSpeechHelper private constructor(private val context: WeakReference<
}
private fun initTTS() = context.get()?.run {
tts = TextToSpeechEngine.getInstance()
ttsEngine = TextToSpeechEngine.getInstance()
.setOnCompletionListener { onDoneListener?.invoke() }
.setOnErrorListener { onErrorListener?.invoke(it) }
.setOnStartListener { onStart?.invoke() }
}
fun speak(message: String): TextToSpeechHelper {
if (tts == null) {
if (ttsEngine == null) {
initTTS()
}
this.message = message
tts?.initTTS(
ttsEngine?.initTTS(
appContext,
message
)
@@ -70,8 +70,8 @@ class TextToSpeechHelper private constructor(private val context: WeakReference<
*/
fun highlight(): TextToSpeechHelper {
if (message == null) throw Exception("Message can't be null for highlighting !! Call speak() first")
tts?.setHighlightedMessage(message!!)
tts?.setOnHighlightListener { i, i2 ->
ttsEngine?.setHighlightedMessage(message!!)
ttsEngine?.setOnHighlightListener { i, i2 ->
onHighlightListener?.invoke(Pair(i, i2))
}
return this
@@ -86,8 +86,8 @@ class TextToSpeechHelper private constructor(private val context: WeakReference<
fun destroy(
action: (() -> Unit) = {}
) {
tts?.destroy()
tts = null
ttsEngine?.destroy()
ttsEngine = null
action.invoke()
INSTANCE = null
}
@@ -118,7 +118,7 @@ class TextToSpeechHelper private constructor(private val context: WeakReference<
}
fun setLanguage(locale: Locale): TextToSpeechHelper {
tts?.setLanguage(locale)
ttsEngine?.setLanguage(locale)
return this
}
@@ -126,12 +126,12 @@ class TextToSpeechHelper private constructor(private val context: WeakReference<
pitch: Float = DEF_SPEECH_AND_PITCH,
speed: Float = DEF_SPEECH_AND_PITCH
): TextToSpeechHelper {
tts?.setPitchAndSpeed(pitch, speed)
ttsEngine?.setPitchAndSpeed(pitch, speed)
return this
}
fun resetPitchAndSpeed(): TextToSpeechHelper {
tts?.resetPitchAndSpeed()
ttsEngine?.resetPitchAndSpeed()
return this
}