mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-03 21:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

move disassociate to SettingsFragment

Browse Source
This commit is contained in:
andrekir
2022-02-12 19:28:49 -03:00
parent 0f3135978c
commit c04c1b4add
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
View File

@@ -286,22 +286,6 @@ class RadioInterfaceService : Service(), Logging {
debug("Setting bonded device to ${address.anonymize}")
// We only keep an association to one device at a time... (move to BluetoothInterface?)
if (BluetoothInterface.hasCompanionDeviceApi(this)) {
if (address != null) {
val deviceManager = getSystemService(CompanionDeviceManager::class.java)
val c = address[0]
val rest = address.substring(1)
deviceManager.associations.forEach { old ->
if (rest != old) {
debug("Forgetting old BLE association ${old.anonymize}")
deviceManager.disassociate(old)
}
}
}
}
getPrefs(this).edit(commit = true) {
if (address == null)
this.remove(DEVADDR_KEY)

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

@@ -1046,6 +1046,14 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
) {
val deviceToPair: BluetoothDevice =
data?.getParcelableExtra(CompanionDeviceManager.EXTRA_DEVICE)!!
// We only keep an association to one device at a time...
deviceManager.associations.forEach { old ->
if (deviceToPair.address != old) {
debug("Forgetting old BLE association ${old.anonymize}")
deviceManager.disassociate(old)
}
}
scanModel.onSelected(
myActivity,
BTScanModel.DeviceListEntry(