diff --git a/libpretixui-android/src/main/java/eu/pretix/libpretixui/android/PhotoCaptureActivity.kt b/libpretixui-android/src/main/java/eu/pretix/libpretixui/android/PhotoCaptureActivity.kt index 3b3ea86..439308b 100644 --- a/libpretixui-android/src/main/java/eu/pretix/libpretixui/android/PhotoCaptureActivity.kt +++ b/libpretixui-android/src/main/java/eu/pretix/libpretixui/android/PhotoCaptureActivity.kt @@ -75,14 +75,14 @@ class PhotoCaptureActivity : CameraDialog.CameraDialogParent, AppCompatActivity( private val onDeviceConnectListener = object : USBMonitor.OnDeviceConnectListener { override fun onAttach(device: UsbDevice) { - if (requestedCameraString == "usb:${device.serialNumber}") { + if (requestedCameraString == "usb:${device.deviceId}") { usbMonitor!!.requestPermission(device) } } override fun onConnect(device: UsbDevice, ctrlBlock: USBMonitor.UsbControlBlock, createNew: Boolean) { releaseUVCCamera() - if (requestedCameraString == "usb:${device.serialNumber}") { + if (requestedCameraString == "usb:${device.deviceId}") { runOnUiThread { viewFinder.visibility = View.GONE uvcTexture.visibility = View.VISIBLE @@ -426,7 +426,7 @@ class PhotoCaptureActivity : CameraDialog.CameraDialogParent, AppCompatActivity( override fun onDialogResult(canceled: Boolean, usbDevice: UsbDevice?) { if (!canceled) { - requestedCameraString = "usb:${usbDevice!!.serialNumber}" + requestedCameraString = "usb:${usbDevice!!.deviceId}" cameraProvider?.unbindAll() } } diff --git a/libuvccamera/libuvccamera.aar b/libuvccamera/libuvccamera.aar index e3d930d..2c818f3 100644 Binary files a/libuvccamera/libuvccamera.aar and b/libuvccamera/libuvccamera.aar differ