From d134ddaab3ef74e3a2395d6f72d144bc9c193813 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Tue, 12 Apr 2022 20:00:02 +0900 Subject: [PATCH] universal7885: parts: Make SharedPreference instance lateinit * Else crashes --- .../src/com/eurekateam/samsungextras/DeviceSettings.kt | 3 ++- .../com/eurekateam/samsungextras/battery/BatteryFragment.kt | 4 +++- .../src/com/eurekateam/samsungextras/dolby/DolbyFragment.kt | 5 +++-- .../samsungextras/flashlight/FlashLightFragment.kt | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt index 5b1c85c..16d1738 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/DeviceSettings.kt @@ -32,10 +32,11 @@ import com.eurekateam.samsungextras.speaker.ClearSpeakerActivity class DeviceSettings : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener { - private val mPrefs: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) + private lateinit var mPrefs : SharedPreferences override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { System.loadLibrary("samsungparts_jni") setPreferencesFromResource(R.xml.preferences_samsung_parts, rootKey) + mPrefs = PreferenceManager.getDefaultSharedPreferences(requireContext()) val mClearSpeakerPref = findPreference(PREF_CLEAR_SPEAKER)!! mClearSpeakerPref.onPreferenceClickListener = Preference.OnPreferenceClickListener { diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryFragment.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryFragment.kt index fabb98d..a625022 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryFragment.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryFragment.kt @@ -22,15 +22,17 @@ import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceManager import androidx.preference.SwitchPreference +import android.content.SharedPreferences import com.eurekateam.samsungextras.R import com.eurekateam.samsungextras.interfaces.Battery class BatteryFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener { private lateinit var mFastChargePref: SwitchPreference private lateinit var mChargePref: SwitchPreference - private val mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) + private lateinit var mSharedPreferences : SharedPreferences override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { addPreferencesFromResource(R.xml.battery_settings) + mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) mFastChargePref = findPreference(PREF_FASTCHARGE)!! mFastChargePref.onPreferenceChangeListener = this mFastChargePref.isChecked = mSharedPreferences.getBoolean(PREF_FASTCHARGE, true) diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyFragment.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyFragment.kt index ee818b9..4f9ab9e 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyFragment.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyFragment.kt @@ -28,14 +28,15 @@ import com.android.settingslib.widget.OnMainSwitchChangeListener import com.android.settingslib.widget.RadioButtonPreference import com.eurekateam.samsungextras.R +import android.content.SharedPreferences class DolbyFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener { private lateinit var switchBar: MainSwitchPreference - private val mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) + private lateinit var mSharedPreferences : SharedPreferences override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { addPreferencesFromResource(R.xml.dolby_settings) - + mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) switchBar = findPreference(PREF_DOLBY_ENABLE)!! switchBar.addOnSwitchChangeListener(this) switchBar.isChecked = DolbyCore.isEnabled() diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightFragment.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightFragment.kt index 14644f8..ce8f355 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightFragment.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/flashlight/FlashLightFragment.kt @@ -21,15 +21,17 @@ import android.os.PerformanceHintManager import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceManager +import android.content.SharedPreferences import com.eurekateam.samsungextras.R import com.eurekateam.samsungextras.interfaces.Flashlight import com.eurekateam.samsungextras.preferences.CustomSeekBarPreference class FlashLightFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener { private lateinit var mFlashLightPref: CustomSeekBarPreference - private val mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) + private lateinit var mSharedPreferences : SharedPreferences override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { addPreferencesFromResource(R.xml.flashlight_settings) + mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) mFlashLightPref = findPreference(PREF_FLASHLIGHT)!! mFlashLightPref.onPreferenceChangeListener = this mFlashLightPref.setMax(10)