zjs81/meshcore-open
1
0
Fork 0
mirror of https://github.com/zjs81/meshcore-open.git synced 2026-04-20 22:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor USB permission handling and reset initial channel sync flag

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

14
android/app/src/main/kotlin/com/meshcore/meshcore_open/MeshcoreUsbFunctions.kt
View file

@ -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)
}
}

2
lib/connector/meshcore_connector.dart
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;