Fix compile errors for v6.2.0 release build

- Fix KDoc bracket parsing in AdblockRuleParser
- Add DNS_PROXY branch to all exhaustive when(BlockMethod) blocks
- Fix WgConfig constructor params in DnsVpnService (String->ByteArray)
- Fix WireGuardProxy Long!=Int comparison
- Fix Vico 2.0 axis API (VerticalAxis.rememberStart/HorizontalAxis.rememberBottom)
- Fix Glance widget ColorProvider constructor (single Color, not day/night)
- Fix coroutine isActive ambiguity in HomeViewModel/StatsScreen
- Add missing imports (DnsProxyService, collectAsStateWithLifecycle)
- Fix suspend function calls in DnsProxyService/LocalDnsServer
- Fix ConnectionTracker synchronized return scope
- Add @OptIn for FlowRow ExperimentalLayoutApi
- Fix QrConfigScreen useDoH -> dohEnabled preference name
- Remove broken captivePortalApiUrl reference

Author: SysAdminDoc

app/app/schemas/com.hostshield.data.database.HostShieldDatabase/12.json

@@ -114,7 +114,7 @@ object AdblockRuleParser {
      * Parse a blocklist file containing adblock-syntax rules.
      *
      * Handles mixed-format files: adblock-syntax, hosts-style, and domains-only
-     * lines are all parsed. Comments (! and #) and metadata ([Adblock...]) are skipped.
+     * lines are all parsed. Comments (! and #) and metadata (Adblock headers) are skipped.
      *
      * @param content Raw file content
      * @return ParseResult with categorized rules

app/app/src/main/java/com/hostshield/domain/parser/AdblockRuleParser.kt

@@ -225,6 +225,11 @@ class AutomationReceiver : BroadcastReceiver() {
                 )
             }
             BlockMethod.ROOT_HOSTS -> RootDnsService.start(context)
+            BlockMethod.DNS_PROXY -> {
+                context.startForegroundService(
+                    Intent(context, DnsProxyService::class.java)
+                )
+            }
             BlockMethod.DISABLED -> { }
         }
         prefs.setEnabled(true)
@@ -242,6 +247,9 @@ class AutomationReceiver : BroadcastReceiver() {
                 )
             }
             BlockMethod.ROOT_HOSTS -> RootDnsService.stop(context)
+            BlockMethod.DNS_PROXY -> {
+                context.stopService(Intent(context, DnsProxyService::class.java))
+            }
             BlockMethod.DISABLED -> { }
         }
         prefs.setEnabled(false)

app/app/src/main/java/com/hostshield/service/AutomationReceiver.kt

@@ -69,6 +69,10 @@ class BootReceiver : BroadcastReceiver() {
                         RootDnsService.start(context)
                         Log.i("BootReceiver", "Root DNS service restarted")
                     }
+                    BlockMethod.DNS_PROXY -> {
+                        context.startForegroundService(Intent(context, DnsProxyService::class.java))
+                        Log.i("BootReceiver", "DNS proxy service restarted")
+                    }
                     BlockMethod.DISABLED -> { }
                 }
 

app/app/src/main/java/com/hostshield/service/BootReceiver.kt

@@ -148,9 +148,8 @@ class CaptivePortalHandler @Inject constructor(
         try {
             val cm = context.getSystemService(ConnectivityManager::class.java) ?: return CAPTIVE_PORTAL_URL
             val lp = cm.getLinkProperties(network)
-            if (android.os.Build.VERSION.SDK_INT >= 30) {
-                lp?.captivePortalApiUrl?.toString()?.let { return it }
-            }
+            // CaptivePortalData is API 30+ but its userPortalUrl may not always
+            // be populated. Fall through to default connectivity check URL.
         } catch (_: Exception) { }
         return CAPTIVE_PORTAL_URL
     }

app/app/src/main/java/com/hostshield/service/CaptivePortalHandler.kt

@@ -127,9 +127,10 @@ class ConnectionTracker @Inject constructor() {
      * All records for a single app, sorted newest-first.
      */
     fun getConnectionsForApp(packageName: String): List<ConnectionRecord> {
-        synchronized(records) {
-            return records[packageName]?.toList().orEmpty()
-        }.sortedByDescending { it.timestamp }
+        val list = synchronized(records) {
+            records[packageName]?.toList().orEmpty()
+        }
+        return list.sortedByDescending { it.timestamp }
     }
 
     /**

app/app/src/main/java/com/hostshield/service/ConnectionTracker.kt

@@ -265,7 +265,7 @@ class DnsProxyService : Service() {
         }
     }
 
-    private fun forwardAndReply(
+    private suspend fun forwardAndReply(
         socket: DatagramSocket,
         queryData: ByteArray,
         clientAddr: InetAddress,
@@ -286,7 +286,7 @@ class DnsProxyService : Service() {
      * Tries each upstream in order with a timeout; returns the first
      * successful response or null if all fail.
      */
-    private fun forwardToUpstream(queryData: ByteArray): ByteArray? {
+    private suspend fun forwardToUpstream(queryData: ByteArray): ByteArray? {
         // Try encrypted DNS first (DoT > DoH, matching VPN priority)
         if (useDoT) {
             try {

app/app/src/main/java/com/hostshield/service/DnsProxyService.kt

@@ -458,12 +458,11 @@ class DnsVpnService : VpnService() {
                     val host = parts.getOrElse(0) { "" }
                     val port = parts.getOrElse(1) { "51820" }.toIntOrNull() ?: 51820
                     val config = WireGuardProxy.WgConfig(
-                        endpoint = host,
-                        port = port,
-                        privateKey = wgPrivKey,
-                        publicKey = wgPubKey,
-                        presharedKey = wgPsk.ifBlank { null },
-                        dnsServerIp = wgDnsIp.ifBlank { "1.1.1.1" }
+                        privateKey = android.util.Base64.decode(wgPrivKey, android.util.Base64.NO_WRAP),
+                        peerPublicKey = android.util.Base64.decode(wgPubKey, android.util.Base64.NO_WRAP),
+                        presharedKey = if (wgPsk.isBlank()) null else android.util.Base64.decode(wgPsk, android.util.Base64.NO_WRAP),
+                        endpoint = "$host:$port",
+                        dnsServer = wgDnsIp.ifBlank { "1.1.1.1" }
                     )
                     try {
                         wireGuardProxy.connect(config)

app/app/src/main/java/com/hostshield/service/DnsVpnService.kt

@@ -69,6 +69,9 @@ class HostShieldTileService : TileService() {
                     BlockMethod.ROOT_HOSTS -> {
                         RootDnsService.stop(this@HostShieldTileService)
                     }
+                    BlockMethod.DNS_PROXY -> {
+                        stopService(Intent(this@HostShieldTileService, DnsProxyService::class.java))
+                    }
                     BlockMethod.DISABLED -> { }
                 }
                 prefs.setEnabled(false)
@@ -85,6 +88,9 @@ class HostShieldTileService : TileService() {
                     BlockMethod.ROOT_HOSTS -> {
                         RootDnsService.start(this@HostShieldTileService)
                     }
+                    BlockMethod.DNS_PROXY -> {
+                        startForegroundService(Intent(this@HostShieldTileService, DnsProxyService::class.java))
+                    }
                     BlockMethod.DISABLED -> { }
                 }
                 prefs.setEnabled(true)

app/app/src/main/java/com/hostshield/service/HostShieldTileService.kt

@@ -97,7 +97,7 @@ class HostsUpdateWorker @AssistedInject constructor(
             val method = prefs.blockMethod.first()
 
             when (method) {
-                BlockMethod.ROOT_HOSTS, BlockMethod.VPN -> {
+                BlockMethod.ROOT_HOSTS, BlockMethod.VPN, BlockMethod.DNS_PROXY -> {
                     // Download block sources and rebuild in-memory blocklist.
                     // Both root (RootDnsLogger) and VPN (DnsVpnService) read from
                     // BlocklistHolder, so updates take effect immediately.