Refactor USB permission handling and reset initial channel sync flag

This commit is contained in:
just_stuff_tm authored and just-stuff-tm committed 2026-03-05 02:26:37 -05:00
1 parent 38d40ca0a4
commit 21ff765e41
2 files changed
+8 -8

No files matched your search

@@ -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)
}
}
+1 -1
View File
@@ -1169,7 +1169,6 @@ class MeshCoreConnector extends ChangeNotifier {
_pendingInitialContactsSync = false;
_bleInitialSyncStarted = false;
_pendingDeferredChannelSyncAfterContacts = false;
_webInitialHandshakeRequestSent = false;
}
bool get _shouldAutoReconnect =>
@@ -2241,6 +2240,7 @@ class MeshCoreConnector extends ChangeNotifier {
(_activeTransport == MeshCoreTransportType.bluetooth ||
_activeTransport == MeshCoreTransportType.usb)) {
_pendingDeferredChannelSyncAfterContacts = false;
_pendingInitialChannelSync = false;
unawaited(getChannels());
}
break;