Skip to content

Fix ANRs and concurrency issues during TTS initialization #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kreativityapps wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix ANRs and concurrency issues during TTS initialization #594

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 25 additions & 30 deletions android/src/main/kotlin/com/tundralabs/fluttertts/FlutterTtsPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,28 +217,25 @@ class FlutterTtsPlugin : MethodCallHandler, FlutterPlugin {
private val onInitListenerWithCallback: TextToSpeech.OnInitListener =
TextToSpeech.OnInitListener { status ->
// Handle pending method calls (sent while TTS was initializing)
synchronized(this@FlutterTtsPlugin) {
val toRun = synchronized(this@FlutterTtsPlugin) {
ttsStatus = status
for (call in pendingMethodCalls) {
call.run()
}
pendingMethodCalls.clear()
ArrayList(pendingMethodCalls).also { pendingMethodCalls.clear() }
}
toRun.forEach { it.run() }

if (status == TextToSpeech.SUCCESS) {
tts!!.setOnUtteranceProgressListener(utteranceProgressListener)
try {
val locale: Locale = tts!!.defaultVoice.locale
if (isLanguageAvailable(locale)) {
tts!!.language = locale
}
} catch (e: NullPointerException) {
Log.e(tag, "getDefaultLocale: " + e.message)
} catch (e: IllegalArgumentException) {
Log.e(tag, "getDefaultLocale: " + e.message)
}

engineResult!!.success(1)
Thread {
try {
val locale = tts!!.defaultVoice.locale
if (isLanguageAvailable(locale)) {
tts!!.setLanguage(locale)
}
} catch (e: Exception) {
Log.e(tag, "getDefaultLocale: " + e.message)
}
}.start()
} else {
engineResult!!.error("TtsError","Failed to initialize TextToSpeech with status: $status", null)
}
Expand All @@ -248,26 +245,24 @@ class FlutterTtsPlugin : MethodCallHandler, FlutterPlugin {
private val onInitListenerWithoutCallback: TextToSpeech.OnInitListener =
TextToSpeech.OnInitListener { status ->
// Handle pending method calls (sent while TTS was initializing)
synchronized(this@FlutterTtsPlugin) {
val toRun = synchronized(this@FlutterTtsPlugin) {
ttsStatus = status
for (call in pendingMethodCalls) {
call.run()
}
pendingMethodCalls.clear()
ArrayList(pendingMethodCalls).also { pendingMethodCalls.clear() }
}
toRun.forEach { it.run() }

if (status == TextToSpeech.SUCCESS) {
tts!!.setOnUtteranceProgressListener(utteranceProgressListener)
try {
val locale: Locale = tts!!.defaultVoice.locale
if (isLanguageAvailable(locale)) {
tts!!.language = locale
Thread {
try {
val locale = tts!!.defaultVoice.locale
if (isLanguageAvailable(locale)) {
tts!!.setLanguage(locale)
}
} catch (e: Exception) {
Log.e(tag, "getDefaultLocale: " + e.message)
}
} catch (e: NullPointerException) {
Log.e(tag, "getDefaultLocale: " + e.message)
} catch (e: IllegalArgumentException) {
Log.e(tag, "getDefaultLocale: " + e.message)
}
}.start()
} else {
Log.e(tag, "Failed to initialize TextToSpeech with status: $status")
}
Expand Down