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

move DELAYED_BROADCAST logic to service

Browse source
This commit is contained in:
andrekir 2022-09-03 07:38:36 -03:00
parent 8516eea9c5
commit e90b856524
4 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/geeksville/mesh/ui/ContactsFragment.kt
View file

@ -235,8 +235,7 @@ class ContactsFragment : ScreenFragment("Messages"), Logging {
// find messages for each contactId
selectedList.forEach { contactId ->
deleteList += messagesTotal.filter {
if (contactId == DataPacket.ID_BROADCAST)
it.to == DataPacket.ID_BROADCAST || it.delayed == 1 // MeshPacket.Delayed.DELAYED_BROADCAST_VALUE == 1
if (contactId == DataPacket.ID_BROADCAST) it.to == DataPacket.ID_BROADCAST
else it.from == contactId && it.to != DataPacket.ID_BROADCAST || it.from == DataPacket.ID_LOCAL && it.to == contactId
}
}

3
app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
View file

@ -225,8 +225,7 @@ class MessagesFragment : Fragment(), Logging {
/// Called when our node DB changes
fun onMessagesChanged(msgIn: Collection<DataPacket>) {
messages = msgIn.filter {
if (contactId == DataPacket.ID_BROADCAST)
it.to == DataPacket.ID_BROADCAST || it.delayed == 1 // MeshPacket.Delayed.DELAYED_BROADCAST_VALUE == 1
if (contactId == DataPacket.ID_BROADCAST) it.to == DataPacket.ID_BROADCAST
else it.from == contactId && it.to != DataPacket.ID_BROADCAST || it.from == DataPacket.ID_LOCAL && it.to == contactId
}.toTypedArray()
notifyDataSetChanged() // FIXME, this is super expensive and redraws all messages