mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-04 14:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that error states take priority when reporting status messages.

Browse Source
This commit is contained in:
Reece H. Dunn
2012-12-20 13:09:17 +00:00
parent 33545918f1
commit b6ef2a607d
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/com/reecedunn/espeak/eSpeakActivity.java
+13 -13
View File
@@ -181,20 +181,20 @@ public class eSpeakActivity extends Activity {
}
final String statusText;
if (!getPackageName().equals(mTts.getDefaultEngine())) {
statusText = getString(R.string.set_default_message);
} else {
switch (mState) {
case ERROR:
statusText = getString(R.string.error_message);
break;
case DOWNLOAD_FAILED:
statusText = getString(R.string.voice_data_failed_message);
break;
default:
switch (mState) {
case ERROR:
statusText = getString(R.string.error_message);
break;
case DOWNLOAD_FAILED:
statusText = getString(R.string.voice_data_failed_message);
break;
default:
if (!getPackageName().equals(mTts.getDefaultEngine())) {
statusText = getString(R.string.set_default_message);
} else {
statusText = null;
break;
}
break;
}
if (statusText != null) {
final String statusLabel = getString(R.string.status);
@@ -254,7 +254,7 @@ public class eSpeakActivity extends Activity {
* @param status The TTS engine initialization status.
*/
private void onInitialized(int status) {
if (status == TextToSpeech.ERROR) {
if (status != TextToSpeech.SUCCESS) {
Log.e(TAG, "Initialization failed (status: " + status + ").");
setState(State.ERROR);
} else {