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

fix duplicate scan table entries when pairing state changes

Browse Source
This commit is contained in:
geeksville
2020-06-04 09:58:29 -07:00
parent db43f47f91
commit fd100d4492
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View File

@@ -153,8 +153,8 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
GeeksvilleApplication.currentActivity as MainActivity,
addr
)
devices.value = oldDevs + Pair(addr, entry) // trigger gui updates
oldDevs[addr] = entry // Add/replace entry
devices.value = oldDevs // trigger gui updates
}
}
}
@@ -186,7 +186,7 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
BTScanEntry("Meshtastic_32ac", "xb", true)
)
devices.value = (testnodes.map { it.macAddress to it }).toMap()
devices.value = (testnodes.map { it.macAddress to it }).toMap().toMutableMap()
// If nothing was selected, by default select the first thing we see
if (selectedMacAddr == null)
@@ -229,7 +229,7 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
}
}
val devices = object : MutableLiveData<Map<String, BTScanEntry>>(mapOf()) {
val devices = object : MutableLiveData<MutableMap<String, BTScanEntry>>(mutableMapOf()) {
/**