* Added system alerts

* Fix for crash when showing location progress

Author: thanksmister

app/build.gradle

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

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

@@ -39,6 +39,10 @@ constructor(private val sharedPreferences: DPreference) {
         get() = this.sharedPreferences.getPrefString(PREF_ALARM_MODE, MODE_DISARM)
         set(value) = this.sharedPreferences.setPrefString(PREF_ALARM_MODE, value)
 
+    var systemAlerts: Boolean
+        get() = this.sharedPreferences.getPrefBoolean(PREF_SYSTEM_NOTIFICATIONS, false)
+        set(value) = this.sharedPreferences.setPrefBoolean(PREF_SYSTEM_NOTIFICATIONS, value)
+
     var inactivityTime: Long
         get() = this.sharedPreferences.getPrefLong(PREF_INACTIVITY_TIME, 300000)
         set(value) = this.sharedPreferences.setPrefLong(PREF_INACTIVITY_TIME, value)
@@ -99,6 +103,10 @@ constructor(private val sharedPreferences: DPreference) {
         return sharedPreferences.getPrefBoolean(PREF_MODULE_ALERTS, false)
     }
 
+    fun hasSystemAlerts(): Boolean {
+        return sharedPreferences.getPrefBoolean(PREF_SYSTEM_NOTIFICATIONS, false)
+    }
+
     fun setAlertsModule(value: Boolean) {
         this.sharedPreferences.setPrefBoolean(PREF_MODULE_ALERTS, value)
     }
@@ -221,6 +229,7 @@ constructor(private val sharedPreferences: DPreference) {
         sharedPreferences.removePreference(PREF_DELAY_TIME)
         sharedPreferences.removePreference(PREF_AWAY_PENDING_TIME)
         sharedPreferences.removePreference(PREF_HOME_PENDING_TIME)
+        sharedPreferences.removePreference(PREF_SYSTEM_NOTIFICATIONS)
     }
 
     companion object {
@@ -242,6 +251,7 @@ constructor(private val sharedPreferences: DPreference) {
         @JvmField val PREF_INACTIVITY_TIME = "pref_inactivity_time"
         @JvmField val PREF_MODULE_NOTIFICATION = "pref_module_notification"
         @JvmField val PREF_MODULE_TSS = "pref_module_tss"
+        @JvmField val PREF_SYSTEM_NOTIFICATIONS = "pref_system_notifications"
         @JvmField val PREF_MODULE_ALERTS = "pref_module_alerts"
         @JvmField val PREF_MAIL_TO = "pref_mail_to"
         @JvmField val PREF_MAIL_FROM = "pref_mail_from"

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/activities/MainActivity.kt

@@ -125,10 +125,11 @@ class MainActivity : BaseActivity(), ViewPager.OnPageChangeListener, ControlsFra
                     this@MainActivity.runOnUiThread({
                         when (state) {
                             AlarmUtils.STATE_DISARM -> {
-                                //TODO CLEAR NOTIFICATIONS
                                 resetInactivityTimer()
-                                val notifications = NotificationUtils(this@MainActivity)
-                                notifications.clearNotification()
+                                if(viewModel.hasSystemAlerts()) {
+                                    val notifications = NotificationUtils(this@MainActivity)
+                                    notifications.clearNotification()
+                                }
                             }
                             AlarmUtils.STATE_ARM_AWAY,
                             AlarmUtils.STATE_ARM_HOME -> {
@@ -137,16 +138,14 @@ class MainActivity : BaseActivity(), ViewPager.OnPageChangeListener, ControlsFra
                             AlarmUtils.STATE_TRIGGERED -> {
                                 awakenDeviceForAction()
                                 stopDisconnectTimer()
-                                if(viewModel.getAlarmMode() == AlarmUtils.MODE_TRIGGERED){
-                                    // TODO alarm notification
+                                if(viewModel.showSystemTriggeredAlert()){
                                     val notifications = NotificationUtils(this@MainActivity)
                                     notifications.createAlarmNotification(getString(R.string.text_notification_trigger_title), getString(R.string.text_notification_trigger_description))
                                 }
                             }
                             AlarmUtils.STATE_PENDING -> {
                                 awakenDeviceForAction()
-                                if(viewModel.getAlarmMode() == AlarmUtils.MODE_ARM_HOME || viewModel.getAlarmMode() == AlarmUtils.MODE_ARM_AWAY){
-                                    // TODO alarm notification
+                                if(viewModel.showSystemPendingAlert()){
                                     val notifications = NotificationUtils(this@MainActivity)
                                     notifications.createAlarmNotification(getString(R.string.text_notification_entry_title), getString(R.string.text_notification_entry_description))
                                 }

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

@@ -20,13 +20,11 @@ package com.thanksmister.iot.mqtt.alarmpanel.ui.fragments
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.os.Build
 import android.os.Bundle
 import android.support.v7.preference.CheckBoxPreference
 import android.support.v7.preference.EditTextPreference
 import android.support.v7.preference.Preference
 import android.support.v7.preference.PreferenceFragmentCompat
-import android.support.v7.preference.PreferenceScreen
 import android.text.TextUtils
 import android.view.View
 import android.widget.Toast
@@ -45,6 +43,7 @@ class NotificationsSettingsFragment : PreferenceFragmentCompat(), SharedPreferen
     @Inject lateinit var configuration: Configuration
 
     private var topicPreference: EditTextPreference? = null
+    private var systemPreference: CheckBoxPreference? = null
     private var notificationsPreference: CheckBoxPreference? = null
     private var tssPreference: CheckBoxPreference? = null
     private var alertsPreference: CheckBoxPreference? = null
@@ -90,11 +89,13 @@ class NotificationsSettingsFragment : PreferenceFragmentCompat(), SharedPreferen
         notificationsPreference = findPreference(Configuration.PREF_MODULE_NOTIFICATION) as CheckBoxPreference
         tssPreference = findPreference(Configuration.PREF_MODULE_TSS) as CheckBoxPreference
         alertsPreference = findPreference(Configuration.PREF_MODULE_ALERTS) as CheckBoxPreference
+        systemPreference = findPreference(Configuration.PREF_SYSTEM_NOTIFICATIONS) as CheckBoxPreference
         descriptionPreference = findPreference("pref_description")
 
         notificationsPreference!!.isChecked = configuration.hasNotifications()
         tssPreference!!.isChecked = configuration.hasTssModule()
         alertsPreference!!.isChecked = configuration.hasAlertsModule()
+        systemPreference!!.isChecked = configuration.hasSystemAlerts()
 
         if (!TextUtils.isEmpty(mqttOptions!!.getNotificationTopic())) {
             topicPreference!!.text = mqttOptions!!.getNotificationTopic()
@@ -135,6 +136,10 @@ class NotificationsSettingsFragment : PreferenceFragmentCompat(), SharedPreferen
                 val alerts = alertsPreference!!.isChecked
                 configuration.setAlertsModule(alerts)
             }
+            Configuration.PREF_SYSTEM_NOTIFICATIONS -> {
+                val checked = systemPreference!!.isChecked
+                configuration.systemAlerts = checked
+            }
         }
     }
 }

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

@@ -49,6 +49,7 @@ import com.thanksmister.iot.mqtt.alarmpanel.utils.LocationUtils
 import timber.log.Timber
 
 import com.thanksmister.iot.mqtt.alarmpanel.R.xml.preferences_weather
+import com.thanksmister.iot.mqtt.alarmpanel.ui.activities.SettingsActivity
 import com.thanksmister.iot.mqtt.alarmpanel.utils.DialogUtils
 import dagger.android.support.AndroidSupportInjection
 import javax.inject.Inject
@@ -248,7 +249,7 @@ class WeatherSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.On
     private fun setUpLocationMonitoring() {
         Timber.d("setUpLocationMonitoring")
         if (isAdded) {
-            dialogUtils.showProgressDialog(getString(R.string.progress_location), false)
+            Toast.makeText(activity as BaseActivity, getString(R.string.progress_location), Toast.LENGTH_SHORT).show()
             locationManager = activity!!.getSystemService(Context.LOCATION_SERVICE) as LocationManager
             val criteria = Criteria()
             criteria.accuracy = Criteria.ACCURACY_COARSE
@@ -261,7 +262,6 @@ class WeatherSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.On
                 }
             } catch (e: SecurityException) {
                 Timber.e("Location manager could not use network provider", e)
-                dialogUtils.hideProgressDialog()
                 Toast.makeText(activity, R.string.toast_invalid_provider, Toast.LENGTH_SHORT).show()
             }
         }

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/utils/DialogUtils.kt

@@ -104,9 +104,9 @@ class DialogUtils(base: Context?) : ContextWrapper(base), LifecycleObserver {
         }
     }
 
-    fun showProgressDialog(message: String, modal: Boolean) {
+    fun showProgressDialog(activity: AppCompatActivity, message: String, modal: Boolean) {
         if (progressDialog == null) {
-            progressDialog = ProgressDialog(this)
+            progressDialog = ProgressDialog(activity)
             progressDialog?.setProgressStyle(ProgressDialog.STYLE_SPINNER)
             progressDialog?.setMessage(message)
             progressDialog?.setCancelable(modal)

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/viewmodel/MessageViewModel.kt

@@ -108,6 +108,18 @@ constructor(application: Application, private val dataSource: MessageDao, privat
         return configuration.alarmMode
     }
 
+    fun hasSystemAlerts(): Boolean {
+        return configuration.hasSystemAlerts()
+    }
+
+    fun showSystemTriggeredAlert(): Boolean {
+        return (getAlarmMode() == AlarmUtils.MODE_TRIGGERED) && hasSystemAlerts()
+    }
+
+    fun showSystemPendingAlert(): Boolean {
+        return (getAlarmMode() == AlarmUtils.MODE_ARM_HOME || getAlarmMode() == AlarmUtils.MODE_ARM_AWAY) && hasSystemAlerts()
+    }
+
     fun isAlarmTriggeredMode(): Boolean {
         return getAlarmMode() == MODE_TRIGGERED
                 || getAlarmMode() == MODE_HOME_TRIGGERED_PENDING

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

@@ -89,7 +89,7 @@
     <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>
-    <string name="preference_summary_notification">Show a notification if the alarm is triggered.</string>
+    <string name="preference_summary_notification">Show a system notification if the alarm is triggered or entry detected.</string>
 
     <string name="preference_title_inactivity">Start screen saver after…</string>
     <string name="preference_summary_inactivity_seconds">After %1$s seconds of inactivity screen dims.</string>
@@ -101,6 +101,7 @@
     <string name="preference_summary_mqtt_notifications">Display or speak notifications from MQTT messages.</string>
 
     <string name="preference_title_alert">Alert Notifications</string>
+    <string name="preference_title_system_notifications">System Notifications</string>
     <string name="preference_summary_alert">Use an alert dialog to show the notification content.</string>
 
     <string name="preference_tts_voice">TTS Voice</string>
@@ -214,7 +215,7 @@
     <string name="text_camera_failed_session">Capture session failed, do you have a camera?</string>
     <string name="text_error_camera_device">Camera error, couldn\'t open the device.</string>
     <string name="text_camera_image_subject">Alarm Panel &lt;%1$s&gt;</string>
-    <string name="pref_mqtt_settings_category">MQTT Settings</string>
+    <string name="pref_mqtt_settings_category">MQTT Notifications</string>
     <string name="dialog_loading">Loading…</string>
     <string name="pref_time_update_title">Update Time</string>
     <string name="pref_time_title">Time Settings</string>

app/src/main/res/xml/preferences_notifications.xml

@@ -22,6 +22,15 @@
 
     <PreferenceCategory android:title="@string/preference_title_notifications">
 
+        <CheckBoxPreference
+            android:key="pref_system_notifications"
+            android:summary="@string/preference_summary_notification"
+            android:title="@string/preference_title_system_notifications"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_mqtt_settings_category">
+
         <CheckBoxPreference
             android:key="pref_module_notification"
             android:summary="@string/preference_title_mqtt_notifications"
@@ -36,13 +45,9 @@
         <CheckBoxPreference
             android:key="pref_module_alerts"
             android:enabled="false"
-            android:summary="@string/preference_summary_alert"
+            android:summary="@string/preference_title_alert"
             android:title="@string/preference_summary_alert" />
 
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/pref_mqtt_settings_category">
-
         <EditTextPreference
             android:key="pref_notification_topic"
             android:negativeButtonText="@android:string/cancel"
@@ -59,4 +64,5 @@
 
     </PreferenceCategory>
 
+
 </PreferenceScreen>