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

WIP for new protobufs

Browse source
This commit is contained in:
Kevin Hester 2020-12-07 19:50:06 +08:00
parent 663ac774de
commit cc2b99fdfc
7 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/geeksville/mesh/DataPacket.kt
View file

@ -22,7 +22,7 @@ enum class MessageStatus : Parcelable {
data class DataPacket(
var to: String? = ID_BROADCAST, // a nodeID string, or ID_BROADCAST for broadcast
val bytes: ByteArray?,
val dataType: Int, // A value such as MeshProtos.Data.Type.OPAQUE_VALUE
val dataType: Int, // A port number for this packet (formerly called DataType, see portnums.proto for new usage instructions)
var from: String? = ID_LOCAL, // a nodeID string, or ID_LOCAL for localhost
var time: Long = System.currentTimeMillis(), // msecs since 1970
var id: Int = 0, // 0 means unassigned
@ -39,14 +39,14 @@ data class DataPacket(
*/
constructor(to: String? = ID_BROADCAST, text: String) : this(
to, text.toByteArray(utf8),
MeshProtos.Data.Type.CLEAR_TEXT_VALUE
Portnums.PortNum.TEXT_MESSAGE_APP_VALUE
)
/**
* If this is a text message, return the string, otherwise null
*/
val text: String?
get() = if (dataType == MeshProtos.Data.Type.CLEAR_TEXT_VALUE)
get() = if (dataType == Portnums.PortNum.TEXT_MESSAGE_APP_VALUE)
bytes?.toString(utf8)
else
null