Skip to content

USB Camera: Use vendor/product, not serial, like pretixPRINT, to avoid permission issues #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raphaelm merged 2 commits into from
Mar 15, 2024
Merged

USB Camera: Use vendor/product, not serial, like pretixPRINT, to avoid permission issues #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6509391
USB Camera: Use vendor/product, not serial, like pretixPRINT, to avoi…
raphaelm Mar 13, 2024
1c57e81
Use different hex function
raphaelm Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions libpretixui-android/src/main/java/eu/pretix/libpretixui/android/PhotoCaptureActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,17 @@ class PhotoCaptureActivity : CameraDialog.CameraDialogParent, AppCompatActivity(
private var uvcBitmapCallback: ((Bitmap) -> Unit)? = null
val executorService = Executors.newFixedThreadPool(3)

private fun usbDeviceId(device: UsbDevice): String {
return "usb:${String.format("%04x", device.vendorId)}:${String.format("%04x", device.productId)}"
}


private val onDeviceConnectListener = object : USBMonitor.OnDeviceConnectListener {
override fun onAttach(device: UsbDevice) {
try {
if (requestedCameraString == "usb:${device.serialNumber}") {
if (usbDeviceId(device) == requestedCameraString) {
usbMonitor!!.requestPermission(device)
} else if (requestedCameraString == "usb:${device.serialNumber}") { // backwards compatibility
usbMonitor!!.requestPermission(device)
}
} catch (e: SecurityException) {
Expand All @@ -90,7 +96,7 @@ class PhotoCaptureActivity : CameraDialog.CameraDialogParent, AppCompatActivity(

override fun onConnect(device: UsbDevice, ctrlBlock: USBMonitor.UsbControlBlock, createNew: Boolean) {
releaseUVCCamera()
if (requestedCameraString == "usb:${device.serialNumber}") {
if (requestedCameraString == usbDeviceId(device) || requestedCameraString == "usb:${device.serialNumber}") {
runOnUiThread {
binding.viewFinder.visibility = View.GONE
binding.uvcTexture.visibility = View.VISIBLE
Expand Down Expand Up @@ -433,7 +439,7 @@ class PhotoCaptureActivity : CameraDialog.CameraDialogParent, AppCompatActivity(

override fun onDialogResult(canceled: Boolean, usbDevice: UsbDevice?) {
if (!canceled) {
requestedCameraString = "usb:${usbDevice!!.serialNumber}"
requestedCameraString = usbDeviceId(usbDevice!!)
cameraProvider?.unbindAll()
}
}
Expand Down