* Addressed crash on older Android devices and dependency injection f…

…or preferences

* Fixed crash with using TTS and devices that do not have TTS installed.

app/build.gradle

@@ -39,7 +39,7 @@ repositories {
 
 def versionMajor = 0
 def versionMinor = 6
-def versionPatch = 1
+def versionPatch = 2
 def versionBuild = 0 // bump for dog food builds, public betas, etc.
 
 def ALARM_CODE() {

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/AboutFragment.kt

@@ -50,7 +50,7 @@ class AboutFragment : BaseFragment() {
 
         try {
             val packageInfo = activity!!.packageManager.getPackageInfo(activity!!.packageName, 0)
-            val versionName = activity!!.findViewById<TextView>(R.id.versionName)
+           // val versionName = activity!!.findViewById<View>(R.id.versionName)
             versionNumber = " v" + packageInfo.versionName
             versionName.text = versionNumber
         } catch (e: PackageManager.NameNotFoundException) {

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/AlarmSettingsFragment.kt

@@ -70,10 +70,7 @@ class AlarmSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSh
     private var confirmCode = false
 
     override fun onAttach(context: Context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // Perform injection here for M (API 23) due to deprecation of onAttach(Activity).
-            AndroidSupportInjection.inject(this)
-        }
+        AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
 

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/CameraSettingsFragment.kt

@@ -56,10 +56,7 @@ class CameraSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnS
     private var rotatePreference: ListPreference? = null
 
     override fun onAttach(context: Context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // Perform injection here for M (API 23) due to deprecation of onAttach(Activity).
-            AndroidSupportInjection.inject(this)
-        }
+        AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
 

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/MqttSettingsFragment.kt

@@ -58,12 +58,8 @@ class MqttSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSha
     private var passwordPreference: EditTextPreference? = null
     private var mqttOptions: MQTTOptions? = null
 
-
     override fun onAttach(context: Context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // Perform injection here for M (API 23) due to deprecation of onAttach(Activity).
-            AndroidSupportInjection.inject(this)
-        }
+        AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
 

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/NotificationsSettingsFragment.kt

@@ -52,10 +52,7 @@ class NotificationsSettingsFragment : PreferenceFragmentCompat(), SharedPreferen
     private var mqttOptions: MQTTOptions? = null
 
     override fun onAttach(context: Context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // Perform injection here for M (API 23) due to deprecation of onAttach(Activity).
-            AndroidSupportInjection.inject(this)
-        }
+        AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
 

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/PlatformSettingsFragment.kt

@@ -39,6 +39,14 @@ class PlatformSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.O
     private var webModulePreference: CheckBoxPreference? = null
     private var webUrlPreference: EditTextPreference? = null
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            // Perform injection here for M (API 23) due to deprecation of onAttach(Activity).
+            AndroidSupportInjection.inject(this)
+        }
+    }
+
     override fun onAttach(context: Context) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             // Perform injection here for M (API 23) due to deprecation of onAttach(Activity).

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/ScreenSettingsFragment.kt

@@ -53,10 +53,7 @@ class ScreenSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnS
     private var imageOptions: ImageOptions? = null
 
     override fun onAttach(context: Context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // Perform injection here for M (API 23) due to deprecation of onAttach(Activity).
-            AndroidSupportInjection.inject(this)
-        }
+        AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
 

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/WeatherSettingsFragment.kt

@@ -117,10 +117,7 @@ class WeatherSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.On
     }
 
     override fun onAttach(context: Context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // Perform injection here for M (API 23) due to deprecation of onAttach(Activity).
-            AndroidSupportInjection.inject(this)
-        }
+        AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
 

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/modules/TextToSpeechModule.kt

@@ -32,10 +32,18 @@ import timber.log.Timber
 import java.util.*
 import android.speech.tts.UtteranceProgressListener
 import android.support.annotation.RequiresApi
+import android.content.Intent
+import android.support.v4.content.ContextCompat.startActivity
+import android.icu.util.ULocale.getLanguage
+
+
+
+
 
 /**
  * Module to use Google Text-to-Speech to speak the payload of MQTT messages.
  */
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
 class TextToSpeechModule( base: Context?, private val configuration: Configuration) : ContextWrapper(base),
         TextToSpeech.OnInitListener, LifecycleObserver {
 
@@ -53,11 +61,10 @@ class TextToSpeechModule( base: Context?, private val configuration: Configurati
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
     override fun onInit(status: Int) {
         if (status == TextToSpeech.SUCCESS) {
+            val sdkVersion = Build.VERSION.SDK_INT
             textToSpeech!!.language = Locale.getDefault()
-            textToSpeech!!.voice = textToSpeech!!.defaultVoice
             textToSpeech!!.setOnUtteranceProgressListener(object : UtteranceProgressListener() {
                 override fun onError(p0: String?) {
                     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.