Fixed camera issue in QR Code assistant fragment when permission wasn't granted yet

This commit is contained in:
Sylvain Berfini 2020-09-08 11:25:02 +02:00
parent 1f6269e46d
commit 6794ed6879
2 changed files with 4 additions and 2 deletions

View file

@ -162,7 +162,7 @@ dependencies {
implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.google.android:flexbox:2.0.0' implementation 'com.google.android:flexbox:2.0.0'
implementation 'com.github.bumptech.glide:glide:4.11.0' implementation 'com.github.bumptech.glide:glide:4.11.0'
implementation 'com.google.android.material:material:1.2.0' implementation 'com.google.android.material:material:1.2.1'
if (firebaseEnabled()) { if (firebaseEnabled()) {
implementation 'com.google.firebase:firebase-messaging:19.0.1' implementation 'com.google.firebase:firebase-messaging:19.0.1'

View file

@ -58,7 +58,7 @@ class QrCodeFragment : GenericFragment<AssistantQrCodeFragmentBinding>() {
}) })
viewModel.setBackCamera() viewModel.setBackCamera()
if (!PermissionHelper.required(requireContext()).hasRecordAudioPermission()) { if (!PermissionHelper.required(requireContext()).hasCameraPermission()) {
Log.i("[QR Code] Asking for CAMERA permission") Log.i("[QR Code] Asking for CAMERA permission")
requestPermissions(arrayOf(android.Manifest.permission.CAMERA), 0) requestPermissions(arrayOf(android.Manifest.permission.CAMERA), 0)
} }
@ -88,6 +88,8 @@ class QrCodeFragment : GenericFragment<AssistantQrCodeFragmentBinding>() {
val granted = grantResults[0] == PackageManager.PERMISSION_GRANTED val granted = grantResults[0] == PackageManager.PERMISSION_GRANTED
if (granted) { if (granted) {
Log.i("[QR Code] CAMERA permission granted") Log.i("[QR Code] CAMERA permission granted")
coreContext.core.reloadVideoDevices()
coreContext.switchCamera()
} else { } else {
Log.w("[QR Code] CAMERA permission denied") Log.w("[QR Code] CAMERA permission denied")
findNavController().navigateUp() findNavController().navigateUp()