Revert "feat(dns): protect provider DNS from unconfirmed overrides (#7902)"

This reverts commit 35a2b6c75c.

Closes #7994
Closes #7993

src/components/setting/mods/dns-viewer.tsx

@@ -33,7 +33,6 @@ import {
   Switch,
 } from '@/components/base'
 import { useClash } from '@/hooks/use-clash'
-import { useVerge } from '@/hooks/use-verge'
 import { showNotice } from '@/services/notice-service'
 import { useThemeMode } from '@/services/states'
 import type { MonacoEditorInstance } from '@/types/monaco'
@@ -184,8 +183,7 @@ const DEFAULT_DNS_CONFIG = {
 
 export function DnsViewer({ ref }: { ref?: Ref<DialogRef> }) {
   const { t } = useTranslation()
-  const { mutateClash } = useClash()
-  const { verge } = useVerge()
+  const { clash, mutateClash } = useClash()
   const themeMode = useThemeMode()
 
   const [open, setOpen] = useState(false)
@@ -550,7 +548,7 @@ export function DnsViewer({ ref }: { ref?: Ref<DialogRef> }) {
         return
       }
 
-      if (verge?.enable_dns_settings) {
+      if (clash?.dns?.enable) {
         await invoke('apply_dns_config', { apply: true })
         mutateClash()
       }

src/components/setting/setting-clash.tsx

@@ -1,16 +1,17 @@
 import { LanRounded, SettingsRounded } from '@mui/icons-material'
 import { MenuItem, Select, TextField, Typography } from '@mui/material'
+import { invoke } from '@tauri-apps/api/core'
 import { useLockFn } from 'ahooks'
 import { useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { updateGeo, type LogLevel } from 'tauri-plugin-mihomo-api'
 
-import { BaseDialog, DialogRef, Switch, TooltipIcon } from '@/components/base'
+import { DialogRef, Switch, TooltipIcon } from '@/components/base'
 import { useClash } from '@/hooks/use-clash'
 import { useClashLog } from '@/hooks/use-clash-log'
 import { useDisplayedMixedPort } from '@/hooks/use-displayed-mixed-port'
 import { useVerge } from '@/hooks/use-verge'
-import { invoke_uwp_tool, setDnsOverride } from '@/services/cmds'
+import { invoke_uwp_tool } from '@/services/cmds'
 import { showNotice } from '@/services/notice-service'
 import getSystem from '@/utils/get-system'
 
@@ -35,7 +36,7 @@ const SettingClash = ({ onError }: Props) => {
   const { t } = useTranslation()
 
   const { clash, version, mutateClash, patchClash } = useClash()
-  const { verge, mutateVerge } = useVerge()
+  const { verge, patchVerge } = useVerge()
   const displayedMixedPort = useDisplayedMixedPort()
   const [, setClashLog] = useClashLog()
 
@@ -46,8 +47,10 @@ const SettingClash = ({ onError }: Props) => {
     'unified-delay': unifiedDelay,
   } = clash ?? {}
 
-  const [dnsConfirmation, setDnsConfirmation] = useState<string | null>(null)
-  const [dnsUpdating, setDnsUpdating] = useState(false)
+  // 独立跟踪DNS设置开关状态
+  const [dnsSettingsEnabled, setDnsSettingsEnabled] = useState(() => {
+    return verge?.enable_dns_settings ?? false
+  })
 
   const webRef = useRef<DialogRef>(null)
   const portRef = useRef<DialogRef>(null)
@@ -71,29 +74,22 @@ const SettingClash = ({ onError }: Props) => {
     }
   }
 
-  const handleDnsToggle = useLockFn(
-    async (enable: boolean, confirmation?: string) => {
-      setDnsUpdating(true)
-      try {
-        const outcome = await setDnsOverride(enable, confirmation)
-        if (outcome.status === 'confirmation_required') {
-          setDnsConfirmation(outcome.source)
-        } else {
-          setDnsConfirmation(null)
-        }
-        mutateVerge()
+  // 实现DNS设置开关处理函数
+  const handleDnsToggle = useLockFn(async (enable: boolean) => {
+    try {
+      setDnsSettingsEnabled(enable)
+      await patchVerge({ enable_dns_settings: enable })
+      await invoke('apply_dns_config', { apply: enable })
+      setTimeout(() => {
         mutateClash()
-      } catch (err: any) {
-        showNotice.error(err)
-      } finally {
-        setDnsUpdating(false)
-      }
-    },
-  )
-
-  const closeDnsConfirmation = () => {
-    if (!dnsUpdating) setDnsConfirmation(null)
-  }
+      }, 500)
+    } catch (err: any) {
+      setDnsSettingsEnabled(!enable)
+      showNotice.error(err)
+      await patchVerge({ enable_dns_settings: !enable }).catch(() => {})
+      throw err
+    }
+  })
 
   return (
     <SettingList title={t('settings.sections.clash.title')}>
@@ -103,24 +99,6 @@ const SettingClash = ({ onError }: Props) => {
       <ClashCoreViewer ref={coreRef} />
       <NetworkInterfaceViewer ref={networkRef} />
       <DnsViewer ref={dnsRef} />
-      <BaseDialog
-        open={dnsConfirmation !== null}
-        title={t('settings.modals.dns.protection.title')}
-        okBtn={t('settings.modals.dns.protection.enableAnyway')}
-        cancelBtn={t('settings.modals.dns.protection.keepDisabled')}
-        contentSx={{ width: { xs: 320, sm: 420 } }}
-        loading={dnsUpdating}
-        disableCancel={dnsUpdating}
-        onCancel={closeDnsConfirmation}
-        onClose={closeDnsConfirmation}
-        onOk={() => {
-          if (dnsConfirmation) void handleDnsToggle(true, dnsConfirmation)
-        }}
-      >
-        <Typography variant="body2">
-          {t('settings.modals.dns.protection.message')}
-        </Typography>
-      </BaseDialog>
       <HeaderConfiguration ref={corsRef} />
       <TunnelsViewer ref={tunnelRef} />
       <SettingItem
@@ -159,8 +137,7 @@ const SettingClash = ({ onError }: Props) => {
       >
         <Switch
           edge="end"
-          checked={verge?.enable_dns_settings ?? false}
-          disabled={dnsUpdating || dnsConfirmation !== null}
+          checked={dnsSettingsEnabled}
           onChange={(_, checked) => handleDnsToggle(checked)}
         />
       </SettingItem>