Fix up add-on binding

Author: zacharee

app/build.gradle

@@ -104,7 +104,7 @@ dependencies {
     implementation 'com.github.zacharee:CollapsiblePreferenceCategory:75d1f8b5c5'
     implementation 'com.github.zacharee:Android-ExpandableTextView:74f653343d'
     implementation 'com.github.zacharee:ComposeIntroSlider:d273cf5734'
-    implementation 'com.github.zacharee:SystemUITunerSystemSettings:0f4f6a0c2d'
+    implementation 'com.github.zacharee:SystemUITunerSystemSettings:6c498b7783'
 
     implementation 'com.bugsnag:bugsnag-android:6.1.0'
     implementation 'com.getkeepsafe.relinker:relinker:1.4.5'

app/src/main/java/com/zacharee1/systemuituner/util/SettingsUtils.kt

@@ -184,10 +184,17 @@ fun Context.getSetting(type: SettingsType, key: String?, def: Any? = null): Stri
                 }
             }
             settingsAddon.hasService -> {
-                settingsAddon.binder?.readSetting(
-                    type.toLibraryType(),
-                    key
-                )
+                if (settingsAddon.binderAvailable) {
+                    settingsAddon.binder?.readSetting(
+                        type.toLibraryType(),
+                        key
+                    )
+                } else {
+                    Log.e("SystemUITuner", "Add-on exists but isn't bound.")
+                    BugsnagUtils.leaveBreadcrumb("Add-on exists but isn't bound for reading.")
+                    ReadSettingFailActivity.start(this, type, key)
+                    null
+                }
             }
             else -> {
                 ReadSettingFailActivity.start(this, type, key)
@@ -268,17 +275,23 @@ private fun Context.writeSystem(key: String?, value: Any?): Boolean {
                     null
                 }
             }
-            settingsAddon.hasService && settingsAddon.binderAvailable -> {
-                val result = settingsAddon.binder?.writeSetting(
-                    com.zacharee1.systemuituner.systemsettingsaddon.library.SettingsType.SYSTEM,
-                    key,
-                    value?.toString()
-                )
-
-                if (result == true) {
-                    true
+            settingsAddon.hasService -> {
+                if (settingsAddon.binderAvailable) {
+                    val result = settingsAddon.binder?.writeSetting(
+                        com.zacharee1.systemuituner.systemsettingsaddon.library.SettingsType.SYSTEM,
+                        key,
+                        value?.toString()
+                    )
+
+                    if (result == true) {
+                        true
+                    } else {
+                        null
+                    }
                 } else {
-                    null
+                    Log.e("SystemUITuner", "Add-on not bound")
+                    BugsnagUtils.leaveBreadcrumb("Add-on exists but isn't bound for writing.")
+                    false
                 }
             }
             else -> {