github/SlimeVR-Server
1
1
Fork 0
mirror of https://github.com/SlimeVR/SlimeVR-Server.git synced 2026-04-06 02:01:58 +02:00
Code Issues 161 Packages Projects Releases Wiki Activity

Clear request more & update usbReceiver comment

Browse Source
This commit is contained in:
Butterscotch!
2025-09-04 04:25:48 -04:00
parent 86b8e0a904
commit f0a72645d7
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/android/src/main/java/dev/slimevr/android/serial/AndroidSerialHandler.kt
View File

@@ -62,17 +62,8 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
val usbReceiver: BroadcastReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
when (intent.action) {
UsbManager.ACTION_USB_DEVICE_ATTACHED -> {
// Maybe use device from `UsbManager.EXTRA_DEVICE`? Would make
// me feel better, but honestly this is just easier and probably
// doesn't actually matter.
detectNewPorts()
}
UsbManager.ACTION_USB_DEVICE_DETACHED -> {
// Might be able to use `UsbManager.EXTRA_DEVICE` like device attached
// event comment, though the device properties may no longer be available
// when this event is fired. This should be checked before proceeding.
UsbManager.ACTION_USB_DEVICE_ATTACHED, UsbManager.ACTION_USB_DEVICE_DETACHED -> {
// Use device from `UsbManager.EXTRA_DEVICE` if this is a problem
detectNewPorts()
}
@@ -110,7 +101,6 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
}
LogManager.info("[SerialHandler] Device added: ${port.descriptivePortName}")
listeners.forEach { it.onNewSerialDevice(port) }
}
@@ -128,7 +118,6 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
}
LogManager.info("[SerialHandler] Device removed: ${port.descriptivePortName}")
listeners.forEach { it.onSerialDeviceDeleted(port) }
}
@@ -204,6 +193,9 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
return false
}
// If we have permission, we aren't requesting anymore
requestingPermission = ""
val connection = manager.openDevice(newPort.port.device)
if (connection == null) {
LogManager.warning(