* Suppress error MQTT error message on Android 5.0

thanksmister · Nov 15, 2018 · bd05cdd · bd05cdd
1 parent a4667ff
commit bd05cdd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/BaseActivity.kt b/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/BaseActivity.kt
@@ -190,16 +190,20 @@ abstract class BaseActivity : DaggerAppCompatActivity() {
      * with the alarm disabled because the disable time will be longer than this.
      */
     open fun showScreenSaver() {
-        if (!configuration.isAlarmTriggeredMode() && configuration.hasScreenSaver() && !isFinishing() ) {
+        if (!configuration.isAlarmTriggeredMode() && configuration.hasScreenSaver() && !isFinishing) {
             inactivityHandler.removeCallbacks(inactivityCallback)
             val hasWeather = (configuration.showWeatherModule() && darkSkyOptions.isValid)
-            dialogUtils.showScreenSaver(this@BaseActivity,
-                    configuration.showPhotoScreenSaver(),
-                    imageOptions,
-                    View.OnClickListener {
-                        dialogUtils.hideScreenSaverDialog()
-                        resetInactivityTimer()
-                    }, darkSkyDataSource, hasWeather)
+            try {
+                dialogUtils.showScreenSaver(this@BaseActivity,
+                        configuration.showPhotoScreenSaver(),
+                        imageOptions,
+                        View.OnClickListener {
+                            dialogUtils.hideScreenSaverDialog()
+                            resetInactivityTimer()
+                        }, darkSkyDataSource, hasWeather)
+            } catch (e: Exception) {
+                Timber.e(e.message)
+            }
         }
     }
 

diff --git a/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/network/AlarmPanelService.kt b/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/network/AlarmPanelService.kt
@@ -330,9 +330,9 @@ class AlarmPanelService : LifecycleService(), MQTTModule.MQTTListener {
     }
 
     override fun onMQTTDisconnect() {
-        Timber.e("onMQTTDisconnect")
+        Timber.w("onMQTTDisconnect")
         if(hasNetwork()) {
-            if(!mqttAlertMessageShown) {
+            if(!mqttAlertMessageShown && Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
                 mqttAlertMessageShown = true
                 sendAlertMessage(getString(R.string.error_mqtt_connection))
             }
@@ -341,21 +341,19 @@ class AlarmPanelService : LifecycleService(), MQTTModule.MQTTListener {
     }
 
     override fun onMQTTException(message: String) {
-        Timber.e("onMQTTException: $message")
+        Timber.w("onMQTTException: $message")
         if(hasNetwork()) {
-            if(!mqttAlertMessageShown) {
+            if(!mqttAlertMessageShown && Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
                 mqttAlertMessageShown = true
                 sendAlertMessage(getString(R.string.error_mqtt_exception))
             }
             reconnectHandler.postDelayed(restartMqttRunnable, 30000)
         }
     }
 
-    private val restartMqttRunnable = object: Runnable {
-        override fun run() {
-            if (mqttModule != null) {
-                mqttModule!!.restart()
-            }
+    private val restartMqttRunnable = Runnable {
+        if (mqttModule != null) {
+            mqttModule!!.restart()
         }
     }
 

diff --git a/build.gradle b/build.gradle
@@ -53,10 +53,10 @@ def versions = [:]
 versions.lifecycle = "1.1.1"
 versions.support = "27.1.1"
 versions.kotlin = "1.2.20"
-versions.navigation = "1.0.0-alpha03"
+versions.navigation = "1.0.0-alpha07"
 versions.min_sdk = 16
 versions.target_sdk = 27
-versions.constraint_layout = "1.1.0"
+versions.constraint_layout = "1.1.3"
 versions.retrofit = "2.2.0"
 versions.stetho = "1.3.1"
 versions.dagger = "2.15"