From 807176f0b563d9a494ce8a51d1c824cb920bd367 Mon Sep 17 00:00:00 2001
From: Benjamin Erhart <berhart@netzarchitekten.com>
Date: Wed, 15 Apr 2026 13:38:25 +0200
Subject: [PATCH] Issue #3: Fixed DoH server URL. Moved settings creation to
 BlocklistOption.

---
 dns/BlocklistOption.swift |  9 +++++++++
 dns/ViewModel.swift       | 18 +-----------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/dns/BlocklistOption.swift b/dns/BlocklistOption.swift
index 649a286..38e582d 100644
--- a/dns/BlocklistOption.swift
+++ b/dns/BlocklistOption.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import NetworkExtension
 
 enum BlocklistOption: String, CaseIterable, Identifiable {
     case secure = "Secure"
@@ -66,4 +67,12 @@ enum BlocklistOption: String, CaseIterable, Identifiable {
             return "2001:db8::1"
         }
     }
+
+    var settings: NEDNSOverHTTPSSettings {
+        let settings = NEDNSOverHTTPSSettings(servers: [ipv4, ipv6])
+        settings.serverURL = URL(string: "https://\(server)/dns-query")
+        settings.matchDomains = [""]
+
+        return settings
+    }
 }
diff --git a/dns/ViewModel.swift b/dns/ViewModel.swift
index 4ec1ada..c39d5b3 100644
--- a/dns/ViewModel.swift
+++ b/dns/ViewModel.swift
@@ -41,23 +41,7 @@ class ViewModel: NSObject, ObservableObject {
     func toggleDns() {
         Task {
             if isDnsEnabled {
-                do {
-                    try await manager.loadFromPreferences()
-                }
-                catch {
-                    log.error("Error loading preferences: \(error)")
-
-                    delayedToggle(false)
-
-                    return
-                }
-
-                let settings = NEDNSOverHTTPSSettings(servers: [blocklist.ipv4, blocklist.ipv6])
-                settings.serverURL = URL(string: "https://\(blocklist.server)")
-                settings.matchDomains = [""]
-
-
-                manager.dnsSettings = settings
+                manager.dnsSettings = blocklist.settings
                 manager.localizedDescription = blocklist.description
 
                 do {