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

pass packet type info to other apps

Browse source
This commit is contained in:
geeksville 2020-01-25 06:33:30 -08:00
parent 7fb0cabee8
commit 54ca2d4eec
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,15 +31,17 @@ class MeshService : Service(), Logging {
* The RECEIVED_OPAQUE: * The RECEIVED_OPAQUE:
* Payload will be the raw bytes which were contained within a MeshPacket.Opaque field * Payload will be the raw bytes which were contained within a MeshPacket.Opaque field
* Sender will be a user ID string * Sender will be a user ID string
* Type will be the Data.Type enum code for this payload
*/ */
fun broadcastReceivedOpaque(senderId: String, payload: ByteArray) { private fun broadcastReceivedOpaque(senderId: String, payload: ByteArray, typ: Int) {
val intent = Intent("$prefix.RECEIVED_OPAQUE") val intent = Intent("$prefix.RECEIVED_OPAQUE")
intent.putExtra(EXTRA_SENDER, senderId) intent.putExtra(EXTRA_SENDER, senderId)
intent.putExtra(EXTRA_PAYLOAD, payload) intent.putExtra(EXTRA_PAYLOAD, payload)
intent.putExtra(EXTRA_TYP, typ)
sendBroadcast(intent) sendBroadcast(intent)
} }
fun broadcastNodeChange(nodeId: String, isOnline: Boolean) { private fun broadcastNodeChange(nodeId: String, isOnline: Boolean) {
val intent = Intent("$prefix.NODE_CHANGE") val intent = Intent("$prefix.NODE_CHANGE")
intent.putExtra(EXTRA_ID, nodeId) intent.putExtra(EXTRA_ID, nodeId)
intent.putExtra(EXTRA_ONLINE, isOnline) intent.putExtra(EXTRA_ONLINE, isOnline)
@ -165,7 +167,7 @@ class MeshService : Service(), Logging {
error("Ignoring opaque from $fromNum because we don't yet know its ID") error("Ignoring opaque from $fromNum because we don't yet know its ID")
else { else {
debug("Received opaque from $fromId ${bytes.size}") debug("Received opaque from $fromId ${bytes.size}")
broadcastReceivedOpaque(fromId, bytes) broadcastReceivedOpaque(fromId, bytes, data.typValue)
} }
else -> TODO() else -> TODO()
} }

1
app/src/main/java/com/geeksville/mesh/RadioInterfaceService.kt
View file

@ -12,6 +12,7 @@ const val EXTRA_PAYLOAD = "$prefix.Payload"
const val EXTRA_SENDER = "$prefix.Sender" const val EXTRA_SENDER = "$prefix.Sender"
const val EXTRA_ID = "$prefix.Id" const val EXTRA_ID = "$prefix.Id"
const val EXTRA_ONLINE = "$prefix.Online" const val EXTRA_ONLINE = "$prefix.Online"
const val EXTRA_TYP = "$prefix.Typ"
/** /**
* Handles the bluetooth link with a mesh radio device. Does not cache any device state, * Handles the bluetooth link with a mesh radio device. Does not cache any device state,