Fix settings crash (home-assistant#911)

anyuta1166 · Sep 12, 2020 · 34e1fd4 · 34e1fd4
1 parent 189bdf6
commit 34e1fd4
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/app/src/main/java/io/homeassistant/companion/android/settings/SettingsFragment.kt b/app/src/main/java/io/homeassistant/companion/android/settings/SettingsFragment.kt
@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.os.Process.myPid
 import android.os.Process.myUid
 import android.text.InputType
+import android.util.Log
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.biometric.BiometricManager
@@ -162,20 +163,28 @@ class SettingsFragment : PreferenceFragmentCompat(), SettingsView {
     override fun disableInternalConnection() {
         findPreference<EditTextPreference>("connection_internal")?.let {
             it.isEnabled = false
-            val unwrappedDrawable =
-                AppCompatResources.getDrawable(requireContext(), R.drawable.ic_computer)
-            unwrappedDrawable?.setTint(Color.DKGRAY)
-            it.icon = unwrappedDrawable
+            try {
+                val unwrappedDrawable =
+                    AppCompatResources.getDrawable(requireContext(), R.drawable.ic_computer)
+                unwrappedDrawable?.setTint(Color.DKGRAY)
+                it.icon = unwrappedDrawable
+            } catch (e: Exception) {
+                Log.d("SettingsFragment", "Unable to set the icon tint", e)
+            }
         }
     }
 
     override fun enableInternalConnection() {
         findPreference<EditTextPreference>("connection_internal")?.let {
             it.isEnabled = true
-            val unwrappedDrawable =
-                AppCompatResources.getDrawable(requireContext(), R.drawable.ic_computer)
-            unwrappedDrawable?.setTint(resources.getColor(R.color.colorAccent))
-            it.icon = unwrappedDrawable
+            try {
+                val unwrappedDrawable =
+                    AppCompatResources.getDrawable(requireContext(), R.drawable.ic_computer)
+                unwrappedDrawable?.setTint(resources.getColor(R.color.colorAccent))
+                it.icon = unwrappedDrawable
+            } catch (e: Exception) {
+                Log.d("SettingsFragment", "Unable to set the icon tint", e)
+            }
         }
     }