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

feat: Add initial handling for Store and Forward PlusPlus packets (#4136)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich 2026-01-04 19:20:57 -06:00 • committed by GitHub
parent 49f6ffe6e5
commit 8400ae854f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/geeksville/mesh/service/MeshDataHandler.kt
View file

@ -156,6 +156,11 @@ constructor(
shouldBroadcast = false
}
Portnums.PortNum.STORE_FORWARD_PLUSPLUS_APP_VALUE -> {
handleStoreForwardPlusPlus(packet)
shouldBroadcast = false
}
Portnums.PortNum.ADMIN_APP_VALUE -> {
handleAdminMessage(packet, myNodeNum)
shouldBroadcast = false
@ -186,6 +191,11 @@ constructor(
handleReceivedStoreAndForward(dataPacket, u, myNodeNum)
}
private fun handleStoreForwardPlusPlus(packet: MeshPacket) {
val sfpp = MeshProtos.StoreForwardPlusPlus.parseFrom(packet.decoded.payload)
Logger.d { "Received StoreForwardPlusPlus packet: $sfpp" }
}
private fun handlePaxCounter(packet: MeshPacket) {
val p = PaxcountProtos.Paxcount.parseFrom(packet.decoded.payload)
nodeManager.handleReceivedPaxcounter(packet.from, p)

3
feature/settings/src/main/kotlin/org/meshtastic/feature/settings/debugging/DebugViewModel.kt
View file

@ -31,7 +31,6 @@ import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
@ -456,6 +455,8 @@ constructor(
PortNum.PAXCOUNTER_APP_VALUE -> PaxcountProtos.Paxcount.parseFrom(payload).toString()
PortNum.STORE_FORWARD_APP_VALUE ->
StoreAndForwardProtos.StoreAndForward.parseFrom(payload).toString()
PortNum.STORE_FORWARD_PLUSPLUS_APP_VALUE ->
MeshProtos.StoreForwardPlusPlus.parseFrom(payload).toString()
PortNum.NEIGHBORINFO_APP_VALUE -> decodeNeighborInfo(payload)
PortNum.TRACEROUTE_APP_VALUE -> decodeTraceroute(packet, payload)
else -> payload.joinToString(" ") { HEX_FORMAT.format(it) }