meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

WIP - doesn't yet build, but changing to set the device addresses the correct way

Browse source
This commit is contained in:
geeksville 2020-04-19 19:23:20 -07:00
parent 513f56f88f
commit cde3f2dec2
6 changed files with 111 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View file

@ -36,15 +36,18 @@ object SLogging : Logging {}
/// Change to a new macaddr selection, updating GUI and radio
fun changeDeviceSelection(context: MainActivity, newAddr: String?) {
RadioInterfaceService.setBondedDeviceAddress(context, newAddr)
model.meshService?.let { service ->
service.setDeviceAddress(context, newAddr)
// Super ugly hack. we force the activity to reconnect FIXME, find a cleaner way
context.unbindMeshService()
context.bindMeshService()
}
}
/// Show the UI asking the user to bond with a device, call changeSelection() if/when bonding completes
private fun requestBonding(activity: MainActivity, device: BluetoothDevice, onSuccess: () -> Unit) {
private fun requestBonding(
activity: MainActivity,
device: BluetoothDevice,
onSuccess: () -> Unit
) {
SLogging.info("Starting bonding for $device")
// We need this receiver to get informed when the bond attempt finished
@ -132,7 +135,10 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
// If nothing was selected, by default select the first thing we see
if (selectedMacAddr == null && entry.bonded)
changeScanSelection(GeeksvilleApplication.currentActivity as MainActivity, addr)
changeScanSelection(
GeeksvilleApplication.currentActivity as MainActivity,
addr
)
devices.value = oldDevs + Pair(addr, entry) // trigger gui updates
}
@ -347,14 +353,16 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
if (!device.bonded)
scanStatusText.setText(R.string.starting_pairing)
b.isSelected = scanModel.onSelected(requireActivity() as MainActivity, device)
b.isSelected =
scanModel.onSelected(requireActivity() as MainActivity, device)
if (!b.isSelected)
scanStatusText.setText(R.string.pairing_failed)
}
}
val hasBonded = RadioInterfaceService.getBondedDeviceAddress(requireContext()) != null
val hasBonded =
RadioInterfaceService.getBondedDeviceAddress(requireContext()) != null
// get rid of the warning text once at least one device is paired
warningNotPaired.visibility = if (hasBonded) View.GONE else View.VISIBLE