mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-05 13:22:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: contacts to use combine() with channels

Browse Source
This commit is contained in:
andrekir
2024-02-15 08:55:35 -03:00
parent f36ff3dbfc
commit f83113710f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/geeksville/mesh/model/UIState.kt
View File

@@ -201,15 +201,14 @@ class UIViewModel @Inject constructor(
packetRepository.getMessagesFrom(contactKey)
}.asLiveData()
@OptIn(ExperimentalCoroutinesApi::class)
val contacts: LiveData<Map<String, Packet>> = packetRepository.getContacts().mapLatest {
val contacts = combine(packetRepository.getContacts(), channels) { contacts, channelSet ->
// Add empty channel placeholders (always show Broadcast contacts, even when empty)
val placeholder = (0 until channelSet.settingsCount).associate { ch ->
val contactKey = "$ch${DataPacket.ID_BROADCAST}"
val data = DataPacket(bytes = null, dataType = 1, time = 0L, channel = ch)
contactKey to Packet(0L, 1, contactKey, 0L, data)
}
it + (placeholder - it.keys)
contacts + (placeholder - contacts.keys)
}.asLiveData()
@OptIn(ExperimentalCoroutinesApi::class)