Skip to content

Use deviceId instead of serial (Fixes SDK28 permission error) #1

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

Closed
pc-coholic wants to merge 1 commit into from
Closed

Use deviceId instead of serial (Fixes SDK28 permission error) #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 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 @@ -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
Expand Down Expand Up @@ -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()
}
}
Expand Down
Binary file modified libuvccamera/libuvccamera.aar
View file
Open in desktop
Binary file not shown.