* Fix for update manager crash due to race condition

Author: thanksmister

app/build.gradle

@@ -40,7 +40,7 @@ repositories {
 def versionMajor = 1
 def versionMinor = 4
 def versionPatch = 7
-def versionBuild = 0 // 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()

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

@@ -77,12 +77,6 @@ abstract class BaseActivity : DaggerAppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(getLayoutId())
         viewModel = ViewModelProviders.of(this, viewModelFactory).get(MessageViewModel::class.java)
-
-        UpdateManager()
-                .setPolicy(UpdatePolicy.Builder()
-                        .setPolicy(POLICY_CHECKS_ONLY)
-                        .setApplyDeadline(2, TimeUnit.DAYS)
-                        .build())
     }
 
     override fun onStart(){
@@ -114,19 +108,18 @@ abstract class BaseActivity : DaggerAppCompatActivity() {
     // These are Android Things specific settings for setting the time, display, and update manager
     private fun setSystemInformation() {
         try {
-
             ScreenManager(Display.DEFAULT_DISPLAY).setBrightnessMode(ScreenManager.BRIGHTNESS_MODE_MANUAL);
             ScreenManager(Display.DEFAULT_DISPLAY).setScreenOffTimeout(configuration.screenTimeout, TimeUnit.MILLISECONDS);
             ScreenManager(Display.DEFAULT_DISPLAY).setBrightness(configuration.screenBrightness);
             ScreenManager(Display.DEFAULT_DISPLAY).setDisplayDensity(configuration.screenDensity);
 
             TimeManager().setTimeZone(configuration.timeZone)
 
-            /*
-             UpdateManager()
-                .setPolicy(UpdatePolicy.Builder()
-                        .setPolicy(POLICY_APPLY_AND_REBOOT)
-                        .build())
+            UpdateManager()
+                    .setPolicy(UpdatePolicy.Builder()
+                            .setPolicy(POLICY_CHECKS_ONLY)
+                            .setApplyDeadline(2, TimeUnit.DAYS)
+                            .build())
 
             UpdateManager()
                     .addStatusListener { updateManagerStatus ->
@@ -138,7 +131,7 @@ abstract class BaseActivity : DaggerAppCompatActivity() {
                                     })
                                     .show()
                         }
-                    }*/
+                    }
         } catch (e:IllegalStateException) {
             Timber.e(e.message)
         }

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

@@ -115,8 +115,8 @@ class MainActivity : BaseActivity(), ViewPager.OnPageChangeListener, ControlsFra
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe({ state ->
-                    Timber.e("Alarm state: " + state)
-                    Timber.e("Alarm mode: " + viewModel.getAlarmMode())
+                    Timber.d("Alarm state: " + state)
+                    Timber.d("Alarm mode: " + viewModel.getAlarmMode())
                     this@MainActivity.runOnUiThread({
                         when (state) {
                             AlarmUtils.STATE_DISARM,

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

@@ -139,8 +139,8 @@ class ControlsFragment : BaseFragment() {
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe({ state ->
-                    Timber.e("Alarm state: " + state)
-                    Timber.e("Alarm mode: " + viewModel.getAlarmMode())
+                    Timber.d("Alarm state: " + state)
+                    Timber.d("Alarm mode: " + viewModel.getAlarmMode())
                     activity?.runOnUiThread(java.lang.Runnable {
                         when (state) {
                             AlarmUtils.STATE_ARM_AWAY -> {

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

@@ -27,7 +27,9 @@ import android.support.v7.preference.ListPreference
 import android.support.v7.preference.Preference
 import android.support.v7.preference.Preference.OnPreferenceClickListener
 import android.support.v7.preference.PreferenceFragmentCompat
+import android.text.TextUtils
 import android.view.View
+import android.widget.Toast
 import com.google.android.things.device.ScreenManager
 import com.google.android.things.device.TimeManager
 import com.thanksmister.iot.mqtt.alarmpanel.R
@@ -210,16 +212,26 @@ class DeviceSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnS
                 timeZonePreference!!.summary = configuration.timeZone
             }
             PREF_DEVICE_SCREEN_DENSITY -> {
-                val density = densityPreference!!.text.toInt()
-                configuration.screenDensity = density
-                densityPreference!!.summary = getString(R.string.pref_density_summary, density.toString())
-                screenManager.setDisplayDensity(density)
+                val value = densityPreference!!.text
+                if(!TextUtils.isEmpty(value)) {
+                    val density = densityPreference!!.text.toInt()
+                    configuration.screenDensity = density
+                    densityPreference!!.summary = getString(R.string.pref_density_summary, density.toString())
+                    screenManager.setDisplayDensity(density)
+                } else {
+                    Toast.makeText(activity, R.string.text_error_only_numbers, Toast.LENGTH_LONG).show()
+                }
             }
             PREF_DEVICE_SCREEN_BRIGHTNESS -> {
-                val brightness = brightnessPreference!!.text.toInt()
-                configuration.screenBrightness = brightness
-                brightnessPreference!!.summary = getString(R.string.pref_device_brightness_summary, brightness.toString())
-                screenManager.setBrightness(brightness)
+                val value = brightnessPreference!!.text
+                if(!TextUtils.isEmpty(value)) {
+                    val brightness = brightnessPreference!!.text.toInt()
+                    configuration.screenBrightness = brightness
+                    brightnessPreference!!.summary = getString(R.string.pref_device_brightness_summary, brightness.toString())
+                    screenManager.setBrightness(brightness)
+                } else {
+                    Toast.makeText(activity, R.string.text_error_only_numbers, Toast.LENGTH_LONG).show()
+                }
             }
             PREF_DEVICE_SCREEN_TIMEOUT -> {
                 val timeout = screenTimeoutPreference!!.value.toLong()

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

@@ -111,8 +111,8 @@ class MainFragment : BaseFragment() {
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe({ state ->
-                    Timber.e("Alarm state: " + state)
-                    Timber.e("Alarm mode: " + viewModel.getAlarmMode())
+                    Timber.d("Alarm state: " + state)
+                    Timber.d("Alarm mode: " + viewModel.getAlarmMode())
                     activity?.runOnUiThread(java.lang.Runnable {
                         when (state) {
                             AlarmUtils.STATE_ARM_AWAY, AlarmUtils.STATE_ARM_HOME -> {

app/src/main/res/xml/preferences_camera.xml

@@ -29,7 +29,6 @@
 
         <ListPreference
             android:key="pref_camera_rotate"
-            android:enabled="false"
             android:title="@string/preference_camera_flip_title"
             android:summary="@string/preference_camera_flip_summary"
             android:entries="@array/flip_directions"
@@ -40,31 +39,27 @@
     <PreferenceCategory android:title="@string/preference_mail_title">
 
         <EditTextPreference
-            android:enabled="false"
             android:key="pref_mail_from"
             android:negativeButtonText="@android:string/cancel"
             android:positiveButtonText="@android:string/ok"
             android:title="@string/preference_mail_from"
             android:summary="@string/preference_mail_from_summary"/>
 
         <EditTextPreference
-            android:enabled="false"
             android:key="pref_mail_to"
             android:negativeButtonText="@android:string/cancel"
             android:positiveButtonText="@android:string/ok"
             android:title="@string/preference_mail_to"
             android:summary="@string/preference_mail_to_summary"/>
 
         <EditTextPreference
-            android:enabled="false"
             android:key="pref_mail_url"
             android:negativeButtonText="@android:string/cancel"
             android:positiveButtonText="@android:string/ok"
             android:title="@string/preference_mail_domain"
             android:summary="@string/preference_mail_domain_summary"/>
 
         <EditTextPreference
-            android:enabled="false"
             android:key="pref_mail_api_key"
             android:negativeButtonText="@android:string/cancel"
             android:positiveButtonText="@android:string/ok"
@@ -74,23 +69,20 @@
         <Preference
             android:key="pref_mail_description"
             android:selectable="false"
-            android:enabled="false"
             android:summary="@string/preference_mail_description" />
 
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_telegram_title">
 
         <EditTextPreference
-            android:enabled="false"
             android:key="pref_telegram_chat_id"
             android:negativeButtonText="@android:string/cancel"
             android:positiveButtonText="@android:string/ok"
             android:title="@string/pref_telegram_chat_id_title"
             android:summary="@string/pref_telegram_chat_id_summary"/>
 
         <EditTextPreference
-            android:enabled="false"
             android:key="pref_telegram_token"
             android:negativeButtonText="@android:string/cancel"
             android:positiveButtonText="@android:string/ok"