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: Remove auto-retry confirmation for messages (#4513)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich 2026-02-10 08:00:41 -06:00 • committed by GitHub
parent 8167fdaa89
commit bd8ff75787
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 1020 additions and 636 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/model/src/main/kotlin/org/meshtastic/core/model/DataPacket.kt
View file

@ -66,7 +66,6 @@ data class DataPacket(
var relayNode: Int? = null,
var relays: Int = 0,
var viaMqtt: Boolean = false, // True if this packet passed via MQTT somewhere along its path
var retryCount: Int = 0, // Number of automatic retry attempts
var emoji: Int = 0,
@Serializable(with = ByteStringSerializer::class)
@TypeParceler<ByteString?, ByteStringParceler>
@ -107,7 +106,6 @@ data class DataPacket(
relayNode = if (parcel.readInt() == 0) null else parcel.readInt()
relays = parcel.readInt()
viaMqtt = parcel.readInt() != 0
retryCount = parcel.readInt()
emoji = parcel.readInt()
sfppHash = ByteStringParceler.create(parcel)
}

2
core/model/src/test/kotlin/org/meshtastic/core/model/DataPacketParcelTest.kt
View file

@ -114,7 +114,6 @@ class DataPacketParcelTest {
relayNode = 202,
relays = 1,
viaMqtt = true,
retryCount = 2,
emoji = 0x1F600,
sfppHash = "sfpp".toByteArray().toByteString(),
)
@ -137,7 +136,6 @@ class DataPacketParcelTest {
assertEquals("relayNode", expected.relayNode, actual.relayNode)
assertEquals("relays", expected.relays, actual.relays)
assertEquals("viaMqtt", expected.viaMqtt, actual.viaMqtt)
assertEquals("retryCount", expected.retryCount, actual.retryCount)
assertEquals("emoji", expected.emoji, actual.emoji)
assertEquals("sfppHash", expected.sfppHash, actual.sfppHash)
}

2
core/model/src/test/kotlin/org/meshtastic/core/model/DataPacketTest.kt
View file

@ -102,7 +102,6 @@ class DataPacketTest {
relayNode = 123,
relays = 2,
viaMqtt = true,
retryCount = 1,
emoji = 10,
sfppHash = sfppHash,
)
@ -132,7 +131,6 @@ class DataPacketTest {
assertEquals(123, packetToUpdate.relayNode)
assertEquals(2, packetToUpdate.relays)
assertEquals(true, packetToUpdate.viaMqtt)
assertEquals(1, packetToUpdate.retryCount)
assertEquals(10, packetToUpdate.emoji)
assertEquals(sfppHash, packetToUpdate.sfppHash)