From 991a8622dc33acce0664c4564e389a231a85dd33 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sat, 24 Dec 2022 09:09:47 -0300 Subject: [PATCH] add hwModel to setOwner --- .../main/java/com/geeksville/mesh/service/MeshService.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index 768e6f3c9..89cf9a3c6 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -1459,17 +1459,18 @@ class MeshService : Service(), Logging { fun setOwner(myId: String?, longName: String, shortName: String, isLicensed: Boolean) { val myNode = myNodeInfo if (myNode != null) { - - if (longName == localNodeInfo?.user?.longName && shortName == localNodeInfo?.user?.shortName) + val my = localNodeInfo?.user + if (longName == my?.longName && shortName == my.shortName && isLicensed == my.isLicensed) debug("Ignoring nop owner change") else { - debug("SetOwner $myId : ${longName.anonymize} : $shortName") + debug("SetOwner Id: $myId longName: ${longName.anonymize} shortName: $shortName isLicensed: $isLicensed") val user = MeshProtos.User.newBuilder().also { if (myId != null) // Only set the id if it was provided it.id = myId it.longName = longName it.shortName = shortName + it.hwModel = my?.hwModel it.isLicensed = isLicensed }.build()