From 98144e099688cbe89f4b8055ea72646361253484 Mon Sep 17 00:00:00 2001
From: Viktor Liu <viktor@netbird.io>
Date: Mon, 11 May 2026 10:10:07 +0200
Subject: [PATCH] Restore value receivers on androidHostManager and reorder
 iosHostManager methods

---
 client/internal/dns/host_android.go | 10 +++++-----
 client/internal/dns/host_ios.go     | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/internal/dns/host_android.go b/client/internal/dns/host_android.go
index 3bd2449bf..48b3e0301 100644
--- a/client/internal/dns/host_android.go
+++ b/client/internal/dns/host_android.go
@@ -17,23 +17,23 @@ func newHostManager(holder *hostsDNSHolder) (*androidHostManager, error) {
 	return &androidHostManager{holder: holder}, nil
 }
 
-func (a *androidHostManager) applyDNSConfig(HostDNSConfig, *statemanager.Manager) error {
+func (a androidHostManager) applyDNSConfig(HostDNSConfig, *statemanager.Manager) error {
 	return nil
 }
 
-func (a *androidHostManager) restoreHostDNS() error {
+func (a androidHostManager) restoreHostDNS() error {
 	return nil
 }
 
-func (a *androidHostManager) supportCustomPort() bool {
+func (a androidHostManager) supportCustomPort() bool {
 	return false
 }
 
-func (a *androidHostManager) string() string {
+func (a androidHostManager) string() string {
 	return "none"
 }
 
-func (a *androidHostManager) getOriginalNameservers() []netip.Addr {
+func (a androidHostManager) getOriginalNameservers() []netip.Addr {
 	hosts := a.holder.get()
 	out := make([]netip.Addr, 0, len(hosts))
 	for ap := range hosts {
diff --git a/client/internal/dns/host_ios.go b/client/internal/dns/host_ios.go
index 76cb61e97..860bb8b50 100644
--- a/client/internal/dns/host_ios.go
+++ b/client/internal/dns/host_ios.go
@@ -15,6 +15,12 @@ type iosHostManager struct {
 	config     HostDNSConfig
 }
 
+func newHostManager(dnsManager IosDnsManager) (*iosHostManager, error) {
+	return &iosHostManager{
+		dnsManager: dnsManager,
+	}, nil
+}
+
 func (a iosHostManager) getOriginalNameservers() []netip.Addr {
 	// Quad9 v4+v6: 9.9.9.9, 2620:fe::fe.
 	return []netip.Addr{
@@ -23,12 +29,6 @@ func (a iosHostManager) getOriginalNameservers() []netip.Addr {
 	}
 }
 
-func newHostManager(dnsManager IosDnsManager) (*iosHostManager, error) {
-	return &iosHostManager{
-		dnsManager: dnsManager,
-	}, nil
-}
-
 func (a iosHostManager) applyDNSConfig(config HostDNSConfig, _ *statemanager.Manager) error {
 	jsonData, err := json.Marshal(config)
 	if err != nil {