Cleanup EH and AZ preferences

This commit is contained in:
Jobobby04
2020-11-30 14:35:31 -05:00
parent f1a6218a4b
commit 9a2ed755b7
38 changed files with 133 additions and 168 deletions
@@ -145,13 +145,13 @@ class EHConfigurator(val context: Context) {
}?.removePrefix("hath_perks=")?.substringBefore(';')
if (keyCookie != null) {
prefs.eh_settingsKey().set(keyCookie)
prefs.exhSettingsKey().set(keyCookie)
}
if (sessionCookie != null) {
prefs.eh_sessionCookie().set(sessionCookie)
prefs.exhSessionCookie().set(sessionCookie)
}
if (hathPerksCookie != null) {
prefs.eh_hathPerksCookies().set(hathPerksCookie)
prefs.exhHathPerksCookies().set(hathPerksCookie)
}
}
@@ -37,7 +37,7 @@ class EhUConfigBuilder {
Entry.TitleDisplayLanguage.DEFAULT
}
configItems += if (preferences.eh_useOriginalImages().get()) {
configItems += if (preferences.exhUseOriginalImages().get()) {
Entry.UseOriginalImages.YES
} else {
Entry.UseOriginalImages.NO
@@ -64,9 +64,9 @@ class EhUConfigBuilder {
configItems += Entry.TagFilteringThreshold(preferences.ehTagFilterValue().get())
configItems += Entry.TagWatchingThreshold(preferences.ehTagWatchingValue().get())
configItems += Entry.LanguageSystem().getLanguages(preferences.eh_settingsLanguages().get().split("\n"))
configItems += Entry.LanguageSystem().getLanguages(preferences.exhSettingsLanguages().get().split("\n"))
configItems += Entry.Categories().categoryConfigs(preferences.eh_EnabledCategories().get().split(",").map { it.toBoolean() })
configItems += Entry.Categories().categoryConfigs(preferences.exhEnabledCategories().get().split(",").map { it.toBoolean() })
// Actually build form body
val formBody = FormBody.Builder()
@@ -18,7 +18,7 @@ class WarnConfigureDialogController : DialogController() {
.title(R.string.settings_profile_note)
.message(R.string.settings_profile_note_message)
.positiveButton(android.R.string.ok) {
prefs.eh_showSettingsUploadWarning().set(false)
prefs.exhShowSettingsUploadWarning().set(false)
ConfiguringDialogController().showDialog(router)
}
.cancelable(false)
@@ -26,7 +26,7 @@ class WarnConfigureDialogController : DialogController() {
companion object {
fun uploadSettings(router: Router) {
if (Injekt.get<PreferencesHelper>().eh_showSettingsUploadWarning().get()) {
if (Injekt.get<PreferencesHelper>().exhShowSettingsUploadWarning().get()) {
WarnConfigureDialogController().showDialog(router)
} else {
ConfiguringDialogController().showDialog(router)