meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

clean up user setting

Browse source
This commit is contained in:
geeksville 2020-02-14 04:41:20 -08:00
parent 0befe48923
commit 9dcfb59ee0
6 changed files with 205 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View file

@ -314,8 +314,8 @@ class MeshService : Service(), Logging {
updatefn(info)
// This might have been the first time we know an ID for this node, so also update the by ID map
val userId = info.user?.id
if (userId != null)
val userId = info.user?.id.orEmpty()
if (userId.isNotEmpty())
nodeDBbyID[userId] = info
// parcelable is busted
@ -535,12 +535,13 @@ class MeshService : Service(), Logging {
clientPackages[receiverName] = packageName
}
override fun setOwner(myId: String, longName: String, shortName: String) =
override fun setOwner(myId: String?, longName: String, shortName: String) =
toRemoteExceptions {
debug("TetOwner $myId : $longName : $shortName")
debug("SetOwner $myId : $longName : $shortName")
val user = MeshProtos.User.newBuilder().also {
it.id = myId
if (myId != null) // Only set the id if it was provided
it.id = myId
it.longName = longName
it.shortName = shortName
}.build()