From 927a46d3cc571d9723063854441b8373d96b63a7 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Thu, 9 May 2013 12:07:21 +0100 Subject: [PATCH] TtsService: Rename mBroadcastReceiver to make its usage clear. --- .../src/com/reecedunn/espeak/TtsService.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/android/src/com/reecedunn/espeak/TtsService.java b/android/src/com/reecedunn/espeak/TtsService.java index 6b0ec99f..05edb755 100644 --- a/android/src/com/reecedunn/espeak/TtsService.java +++ b/android/src/com/reecedunn/espeak/TtsService.java @@ -66,6 +66,8 @@ public class TtsService extends TextToSpeechService { private List mAvailableVoices; private Voice mMatchingVoice = null; + private BroadcastReceiver mOnLanguagesDownloaded = null; + private String mLanguage = DEFAULT_LANGUAGE; private String mCountry = DEFAULT_COUNTRY; private String mVariant = DEFAULT_VARIANT; @@ -79,8 +81,8 @@ public class TtsService extends TextToSpeechService { @Override public void onDestroy() { super.onDestroy(); - if (mBroadcastReceiver != null) { - unregisterReceiver(mBroadcastReceiver); + if (mOnLanguagesDownloaded != null) { + unregisterReceiver(mOnLanguagesDownloaded); } } @@ -108,8 +110,8 @@ public class TtsService extends TextToSpeechService { @Override protected int onIsLanguageAvailable(String language, String country, String variant) { if (!CheckVoiceData.hasBaseResources(this) || CheckVoiceData.canUpgradeResources(this)) { - if (mBroadcastReceiver == null) { - mBroadcastReceiver = new BroadcastReceiver() { + if (mOnLanguagesDownloaded == null) { + mOnLanguagesDownloaded = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { initializeTtsEngine(); @@ -117,7 +119,7 @@ public class TtsService extends TextToSpeechService { }; final IntentFilter filter = new IntentFilter(DownloadVoiceData.BROADCAST_LANGUAGES_UPDATED); - registerReceiver(mBroadcastReceiver, filter); + registerReceiver(mOnLanguagesDownloaded, filter); } final Intent intent = new Intent(this, DownloadVoiceData.class); @@ -308,9 +310,4 @@ public class TtsService extends TextToSpeechService { mCallback.done(); } }; - - /** - * Listens for language update broadcasts and initializes the eSpeak engine. - */ - private BroadcastReceiver mBroadcastReceiver = null; }