Refactor USB permission handling and reset initial channel sync flag

This commit is contained in:
just_stuff_tm
2026-03-03 15:08:05 -05:00
committed by just-stuff-tm
parent 38d40ca0a4
commit 21ff765e41
2 changed files with 8 additions and 8 deletions
@@ -82,13 +82,6 @@ class MeshcoreUsbFunctions(
return
}
val granted =
intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
if (!granted) {
result.error("usb_permission_denied", "USB permission denied", null)
return
}
val device = findUsbDevice(portName)
if (device == null) {
result.error(
@@ -99,6 +92,13 @@ class MeshcoreUsbFunctions(
return
}
val granted =
intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
if (!granted || !usbManager.hasPermission(device)) {
result.error("usb_permission_denied", "USB permission denied", null)
return
}
openUsbDevice(device, pendingConnectBaudRate, result)
}
}