Re-order code hierarchy. Prioritize loading settings from pref

This commit is contained in:
Jace 2022-08-22 12:05:18 +08:00 committed by GitHub
parent f1ccf7bb6d
commit ea64fb35e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -417,6 +417,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
app.initClient(this) app.initClient(this)
val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
val settingsForProvider = SettingsJson()
settingsForProvider.enableAdult = settingsManager.getBoolean(getString(R.string.enable_nsfw_on_providers_key), false)
MainAPI.settingsForProvider = settingsForProvider
loadThemes(this) loadThemes(this)
updateLocale() updateLocale()
@ -507,11 +512,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
SearchResultBuilder.updateCache(this) SearchResultBuilder.updateCache(this)
val settingsForProvider = SettingsJson()
settingsForProvider.enableAdult = settingsManager.getBoolean(getString(R.string.enable_nsfw_on_providers_key), false)
MainAPI.settingsForProvider = settingsForProvider
ioSafe { ioSafe {
initAll() initAll()
// No duplicates (which can happen by registerMainAPI) // No duplicates (which can happen by registerMainAPI)