diff --git a/src/ui/components/menu/Options.tsx b/src/ui/components/menu/Options.tsx index 345dbf2..7f750ca 100644 --- a/src/ui/components/menu/Options.tsx +++ b/src/ui/components/menu/Options.tsx @@ -4,7 +4,7 @@ import { dataDir } from '@tauri-apps/api/path' import DirInput from '../common/DirInput' import Menu from './Menu' import Tr, { getLanguages, translate } from '../../../utils/language' -import { setConfigOption, getConfig, getConfigOption } from '../../../utils/configuration' +import { setConfigOption, getConfig, getConfigOption, Configuration } from '../../../utils/configuration' import Checkbox from '../common/Checkbox' import Divider from './Divider' import { getThemeList } from '../../../utils/themes' @@ -78,9 +78,6 @@ export default class Options extends React.Component { this.setCustomBackground = this.setCustomBackground.bind(this) this.toggleEncryption = this.toggleEncryption.bind(this) this.restoreMetadata = this.restoreMetadata.bind(this) - this.toggleMetadata = this.toggleMetadata.bind(this) - this.toggleProxy = this.toggleProxy.bind(this) - this.toggleLoginWipe = this.toggleLoginWipe.bind(this) } async componentDidMount() { @@ -257,33 +254,14 @@ export default class Options extends React.Component { }) } - async toggleMetadata() { - const changedVal = !(await getConfigOption('patch_metadata')) + async toggleOption(opt: keyof Configuration) { + const changedVal = !(await getConfigOption(opt)) - await setConfigOption('patch_metadata', changedVal) + await setConfigOption(opt, changedVal) + // @ts-expect-error shut up bitch this.setState({ - patch_metadata: changedVal, - }) - } - - async toggleProxy() { - const changedVal = !(await getConfigOption('use_internal_proxy')) - - await setConfigOption('use_internal_proxy', changedVal) - - this.setState({ - use_internal_proxy: changedVal, - }) - } - - async toggleLoginWipe() { - const changedVal = !(await getConfigOption('wipe_login')) - - await setConfigOption('wipe_login', changedVal) - - this.setState({ - wipe_login: changedVal, + [opt]: changedVal, }) } @@ -315,7 +293,11 @@ export default class Options extends React.Component { @@ -405,7 +395,7 @@ export default class Options extends React.Component {