From 15419aba6c40fed4b37675ba9255db2a26377c0e Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 8 Apr 2026 07:54:47 -0500 Subject: [PATCH] fix: resolve correct node public key in sendSharedContact and favoriteNode (#5005) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com> --- .../org/meshtastic/core/service/AndroidRadioControllerImpl.kt | 4 ++-- .../org/meshtastic/core/service/DirectRadioControllerImpl.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/service/src/androidMain/kotlin/org/meshtastic/core/service/AndroidRadioControllerImpl.kt b/core/service/src/androidMain/kotlin/org/meshtastic/core/service/AndroidRadioControllerImpl.kt index 216d8fb37..ea1884ab1 100644 --- a/core/service/src/androidMain/kotlin/org/meshtastic/core/service/AndroidRadioControllerImpl.kt +++ b/core/service/src/androidMain/kotlin/org/meshtastic/core/service/AndroidRadioControllerImpl.kt @@ -50,12 +50,12 @@ class AndroidRadioControllerImpl( } override suspend fun favoriteNode(nodeNum: Int) { - val nodeDef = nodeRepository.getNode(nodeNum.toString()) + val nodeDef = nodeRepository.getNode(DataPacket.nodeNumToDefaultId(nodeNum)) serviceRepository.onServiceAction(ServiceAction.Favorite(nodeDef)) } override suspend fun sendSharedContact(nodeNum: Int): Boolean { - val nodeDef = nodeRepository.getNode(nodeNum.toString()) + val nodeDef = nodeRepository.getNode(DataPacket.nodeNumToDefaultId(nodeNum)) val contact = org.meshtastic.proto.SharedContact( node_num = nodeDef.num, diff --git a/core/service/src/commonMain/kotlin/org/meshtastic/core/service/DirectRadioControllerImpl.kt b/core/service/src/commonMain/kotlin/org/meshtastic/core/service/DirectRadioControllerImpl.kt index 0f645c6e3..fce0438dd 100644 --- a/core/service/src/commonMain/kotlin/org/meshtastic/core/service/DirectRadioControllerImpl.kt +++ b/core/service/src/commonMain/kotlin/org/meshtastic/core/service/DirectRadioControllerImpl.kt @@ -78,12 +78,12 @@ class DirectRadioControllerImpl( } override suspend fun favoriteNode(nodeNum: Int) { - val nodeDef = nodeRepository.getNode(nodeNum.toString()) + val nodeDef = nodeRepository.getNode(DataPacket.nodeNumToDefaultId(nodeNum)) serviceRepository.onServiceAction(ServiceAction.Favorite(nodeDef)) } override suspend fun sendSharedContact(nodeNum: Int): Boolean { - val nodeDef = nodeRepository.getNode(nodeNum.toString()) + val nodeDef = nodeRepository.getNode(DataPacket.nodeNumToDefaultId(nodeNum)) val contact = SharedContact(node_num = nodeDef.num, user = nodeDef.user, manually_verified = nodeDef.manuallyVerified) val action = ServiceAction.SendContact(contact)