* Fix for crash when switching views while TTS is initializing (some devices)

* Fix for crash when switching views while MQTT is initializing (some devices)
* Updated Kotlin version

Author: thanksmister

app/build.gradle

@@ -40,7 +40,7 @@ repositories {
 def versionMajor = 0
 def versionMinor = 6
 def versionPatch = 8
-def versionBuild = 1 // bump for dog food builds, public betas, etc.
+def versionBuild = 2 // bump for dog food builds, public betas, etc.
 
 def ALARM_CODE() {
     Properties properties = new Properties()
@@ -279,5 +279,5 @@ dependencies {
     compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
         transitive = true;
     }
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/network/MQTTService.kt

@@ -159,6 +159,7 @@ class MQTTService(private var context: Context, options: MQTTOptions,
             }
 
             mqttClient = MqttUtils.getMqttAndroidClient(context, mqttOptions?.brokerUrl!!, mqttOptions?.getClientId()!!, object : MqttCallbackExtended {
+                @Throws(NullPointerException::class)
                 override fun connectComplete(reconnect: Boolean, serverURI: String) {
                     if (reconnect) {
                         Timber.d("Reconnected to : " + serverURI)
@@ -218,7 +219,8 @@ class MQTTService(private var context: Context, options: MQTTOptions,
             mReady.set(true)
         } catch (e: IllegalArgumentException) {
             e.printStackTrace()
-            Timber.e(e, "Error disconnecting MQTT service")
+        } catch (e: NullPointerException) {
+            e.printStackTrace()
         } catch (e: Exception) {
             e.printStackTrace()
             if (listener != null) {

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

@@ -61,11 +61,11 @@ class TextToSpeechModule( base: Context?, private val configuration: Configurati
         }
     }
 
+    // FIXME null pointer line 67 for textToSpeech
     override fun onInit(status: Int) {
-        if (status == TextToSpeech.SUCCESS) {
-            val sdkVersion = Build.VERSION.SDK_INT
-            textToSpeech!!.language = Locale.getDefault()
-            textToSpeech!!.setOnUtteranceProgressListener(object : UtteranceProgressListener() {
+        if (status == TextToSpeech.SUCCESS && textToSpeech != null) {
+            textToSpeech?.language = Locale.getDefault()
+            textToSpeech?.setOnUtteranceProgressListener(object : UtteranceProgressListener() {
                 override fun onError(p0: String?) {
                     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
                 }
@@ -103,7 +103,6 @@ class TextToSpeechModule( base: Context?, private val configuration: Configurati
         if(textToSpeech != null) {
             textToSpeech?.stop()
             textToSpeech?.shutdown()
-            textToSpeech = null
         }
     }
 }

app/src/main/res/values-es/strings.xml

@@ -110,7 +110,7 @@
 
     <string name="preference_tts_topic">TTS Topic</string>
     <string name="preference_tts_topic_title">Esteblece el "Topic Value"</string>
-    <string name="preference_tts_topic_summary">Formato de ejemplo para el "message topic" y "alarmState" que será reproducido (ten en cuenta que para reproducir locuciones TTS, se necesitan unos altavoces externos): \n\n"{'topic':'home/notification', 'alarmState':'Hello!'}"</string>
+    <string name="preference_tts_topic_summary">Formato de ejemplo para el "message topic" y "alarmState" que será reproducido (ten en cuenta que para reproducir locuciones TTS, se necesitan unos altavoces externos): \n\n"{\"topic\":\"home/notification\", \"payload\":\"Hello!\"}"</string>
 
 
     <string name="preference_camera">Capturas con la cámara</string>

app/src/main/res/values/strings.xml

@@ -85,7 +85,7 @@
     <string name="preference_title_web">Home Automation Page</string>
     <string name="preference_summary_web">Displays your home automation web page by swiping main screen.</string>
     <string name="preference_title_web_url">Platform Address</string>
-    <string name="preference_summary_web_url">Enter the IP address of your home automation web page with prefix and port if needed (example: http://ipaddress:8123).</string>
+    <string name="preference_summary_web_url">Enter the IP address of your home automation web page with prefix and port if needed (example: http://ipaddress:port).</string>
     <string name="preference_web_description">This is an experimental feature. The web page is rendered with Android\'s version of the Chrome Browser and may render differently depending on your Android SDK and WebView versions.</string>
 
     <string name="preference_title_notification">Notifications</string>
@@ -110,7 +110,7 @@
 
     <string name="preference_tts_topic">TTS Topic</string>
     <string name="preference_tts_topic_title">Set Topic Value</string>
-    <string name="preference_tts_topic_summary">Example format for the message topic and alarmState to be spoken (note that externally powered speakers are required for TTS): \n\n"{'topic':'home/notification', 'alarmState':'Hello!'}"</string>
+    <string name="preference_tts_topic_summary">Example format for the message topic and alarmState to be spoken (note that externally powered speakers are required for TTS): \n\n"{\"topic\":\"home/notification\", \"payload\":\"Hello!\"}"</string>
 
 
     <string name="preference_camera">Camera Capture</string>

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.0'
+    ext.kotlin_version = '1.2.20'
     repositories {
         jcenter()
         maven {