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

fix (#2165): position exchange not working (#2169)

Browse source 
Co-authored-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
Jeremiah K 2025-06-19 11:42:48 -05:00 • committed by GitHub
parent 44100c955d
commit 67ffaca01c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2272,13 +2272,38 @@ class MeshService : Service(), Logging {
}
}
override fun requestPosition(destNum: Int, position: Position) = toRemoteExceptions {
sendToRadio(newMeshPacketTo(destNum).buildMeshPacket(
channel = nodeDBbyNodeNum[destNum]?.channel ?: 0,
priority = MeshPacket.Priority.BACKGROUND,
) {
portnumValue = Portnums.PortNum.POSITION_APP_VALUE
wantResponse = true
})
if (destNum != myNodeNum) {
// Determine the best position to send based on user preferences and available data
val provideLocation = sharedPreferences.getBoolean("provide-location-$myNodeNum", false)
val currentPosition = when {
// Use provided position if valid and user allows phone location sharing
provideLocation && position.isValid() -> position
// Otherwise use the last valid position from nodeDB (node GPS or static)
else -> nodeDBbyNodeNum[myNodeNum]?.position?.let { Position(it) }?.takeIf { it.isValid() }
}
if (currentPosition == null) {
debug("Position request skipped - no valid position available")
return@toRemoteExceptions
}
// Convert Position to MeshProtos.Position for the payload
val meshPosition = position {
latitudeI = Position.degI(currentPosition.latitude)
longitudeI = Position.degI(currentPosition.longitude)
altitude = currentPosition.altitude
time = currentSecond()
}
sendToRadio(newMeshPacketTo(destNum).buildMeshPacket(
channel = nodeDBbyNodeNum[destNum]?.channel ?: 0,
priority = MeshPacket.Priority.BACKGROUND,
) {
portnumValue = Portnums.PortNum.POSITION_APP_VALUE
payload = meshPosition.toByteString()
wantResponse = true
})
}
}
override fun setFixedPosition(destNum: Int, position: Position) = toRemoteExceptions {