mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'osmdroid-phase2' of github.com:ScriptTactics/Meshtastic-Android into osmdroid-phase2

pull/489/head
PWRxPSYCHO 2022-09-22 08:35:49 -04:00
rodzic 9b1dfb0d02 86c9ca55dd
commit e156bf1f6e
2 zmienionych plików z 5 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/src/main/java/com/geeksville/mesh/database/dao/PacketDao.kt
Wyświetl plik

@ -23,7 +23,7 @@ interface PacketDao {
fun getMessagesFrom(contact: String): Flow<List<Packet>> fun getMessagesFrom(contact: String): Flow<List<Packet>>
@Query("Select * from packet where data = :data") @Query("Select * from packet where data = :data")
fun findDataPacket(data: DataPacket): Packet fun findDataPacket(data: DataPacket): Packet?
@Query("Delete from packet where port_num = 1") @Query("Delete from packet where port_num = 1")
fun deleteAllMessages() fun deleteAllMessages()
@ -45,6 +45,6 @@ interface PacketDao {
@Transaction @Transaction
fun updateMessageStatus(data: DataPacket, m: MessageStatus) { fun updateMessageStatus(data: DataPacket, m: MessageStatus) {
val new = data.copy(status = m) val new = data.copy(status = m)
update(findDataPacket(data).copy(data = new)) findDataPacket(data)?.let { update(it.copy(data = new)) }
} }
} }

5
app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt
Wyświetl plik

@ -236,9 +236,10 @@ class BTScanModel @Inject constructor(
devices.value = (testnodes.map { it.fullAddress to it }).toMap().toMutableMap() devices.value = (testnodes.map { it.fullAddress to it }).toMap().toMutableMap()
// If nothing was selected, by default select the first thing we see // If nothing was selected, by default select the first thing we see
if (selectedAddress == null) val activity = GeeksvilleApplication.currentActivity
if (selectedAddress == null && activity is MainActivity)
changeScanSelection( changeScanSelection(
GeeksvilleApplication.currentActivity as MainActivity, activity,
testnodes.first().fullAddress testnodes.first().fullAddress
) )