From 12ceb58868535a59e64cf584ee901b3f0b36198c Mon Sep 17 00:00:00 2001
From: grendervill <focuse@grandell.ru>
Date: Thu, 20 Aug 2026 00:19:28 +0300
Subject: [PATCH] =?UTF-8?q?AeroToss:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B4=D1=83=D0=B1=D0=BB=D0=B8?=
 =?UTF-8?q?=20=D1=83=D1=81=D1=82=D1=80=D0=BE=D0=B9=D1=81=D1=82=D0=B2=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=82=D0=B5=D0=BB=D0=B5=D1=84=D0=BE=D0=BD=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- CompositeAndroidDiscovery: используется единый ключ device.id
- Устройства из TCP и Wi-Fi Direct дедуплицируются автоматически
---
 .../com/aerotoss/discovery/CompositeAndroidDiscovery.kt      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/androidMain/kotlin/com/aerotoss/discovery/CompositeAndroidDiscovery.kt b/app/src/androidMain/kotlin/com/aerotoss/discovery/CompositeAndroidDiscovery.kt
index e379f19..db3c238 100644
--- a/app/src/androidMain/kotlin/com/aerotoss/discovery/CompositeAndroidDiscovery.kt
+++ b/app/src/androidMain/kotlin/com/aerotoss/discovery/CompositeAndroidDiscovery.kt
@@ -36,8 +36,9 @@ class CompositeAndroidDiscovery(
                 wifiDirectManager.devices
             ) { tcpDevices, wifiDirectDevices ->
                 val all = mutableMapOf<String, Device>()
-                tcpDevices.forEach { all["tcp:${it.id}"] = it }
-                wifiDirectDevices.forEach { all["wifi:${it.id}"] = it }
+                // Use device ID as key for both sources - deduplicates automatically
+                tcpDevices.forEach { all[it.id] = it }
+                wifiDirectDevices.forEach { all[it.id] = it }
                 all.values.toList()
             }.collect { _devices.value = it }
         }