From fd100d44929b491bbc694744711d2bdc6c003cab Mon Sep 17 00:00:00 2001 From: geeksville Date: Thu, 4 Jun 2020 09:58:29 -0700 Subject: [PATCH] fix duplicate scan table entries when pairing state changes --- .../main/java/com/geeksville/mesh/ui/SettingsFragment.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt index 2f4d97615..cbbdd879a 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt @@ -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>(mapOf()) { + val devices = object : MutableLiveData>(mutableMapOf()) { /**