Commit 16e0e3fd authored by Mygod's avatar Mygod

Do not overwrite user config

parent 1c9f1f8f
...@@ -37,12 +37,10 @@ class GlobalSettingsPreferenceFragment : PreferenceFragmentCompat() { ...@@ -37,12 +37,10 @@ class GlobalSettingsPreferenceFragment : PreferenceFragmentCompat() {
preferenceManager.preferenceDataStore = DataStore.publicStore preferenceManager.preferenceDataStore = DataStore.publicStore
DataStore.initGlobal() DataStore.initGlobal()
addPreferencesFromResource(R.xml.pref_global) addPreferencesFromResource(R.xml.pref_global)
val boot = findPreference(Key.persistAcrossReboot) as SwitchPreference (findPreference(Key.persistAcrossReboot) as SwitchPreference).setOnPreferenceChangeListener { _, value ->
boot.setOnPreferenceChangeListener { _, value ->
BootReceiver.enabled = value as Boolean BootReceiver.enabled = value as Boolean
true true
} }
boot.isChecked = BootReceiver.enabled
val canToggleLocked = findPreference(Key.directBootAware) val canToggleLocked = findPreference(Key.directBootAware)
if (Build.VERSION.SDK_INT >= 24) canToggleLocked.setOnPreferenceChangeListener { _, newValue -> if (Build.VERSION.SDK_INT >= 24) canToggleLocked.setOnPreferenceChangeListener { _, newValue ->
......
...@@ -161,12 +161,9 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo ...@@ -161,12 +161,9 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
stats = findPreference(Key.controlStats) stats = findPreference(Key.controlStats)
controlImport = findPreference(Key.controlImport) controlImport = findPreference(Key.controlImport)
(findPreference(Key.persistAcrossReboot) as SwitchPreference).apply { (findPreference(Key.persistAcrossReboot) as SwitchPreference).setOnPreferenceChangeListener { _, value ->
setOnPreferenceChangeListener { _, value -> BootReceiver.enabled = value as Boolean
BootReceiver.enabled = value as Boolean true
true
}
isChecked = BootReceiver.enabled
} }
tfo = findPreference(Key.tfo) as SwitchPreference tfo = findPreference(Key.tfo) as SwitchPreference
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment