mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-31 04:04:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

add hwModel to setOwner

Browse Source
This commit is contained in:
andrekir
2022-12-24 09:09:47 -03:00
parent e550219e1e
commit 991a8622dc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View File

@@ -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()