From 808fbb1be06b4f19f7653246ebb6ffdc35e9315e Mon Sep 17 00:00:00 2001 From: Sergey Sychev Date: Mon, 11 Feb 2019 11:36:50 +0300 Subject: [PATCH] fix(android): permission compat on android 6 devices (#2099) * Handle boolean cameraPermissionResult on Android * handle boolean hasRecordAudioPermissions result --- src/RNCamera.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/RNCamera.js b/src/RNCamera.js index 272a098..c44d381 100644 --- a/src/RNCamera.js +++ b/src/RNCamera.js @@ -37,7 +37,11 @@ const requestPermissions = async ( PermissionsAndroid.PERMISSIONS.CAMERA, params, ); - hasCameraPermissions = cameraPermissionResult === PermissionsAndroid.RESULTS.GRANTED; + if (typeof cameraPermissionResult === 'boolean') { + hasCameraPermissions = cameraPermissionResult; + } else { + hasCameraPermissions = cameraPermissionResult === PermissionsAndroid.RESULTS.GRANTED; + } } if (captureAudio) { @@ -49,7 +53,11 @@ const requestPermissions = async ( PermissionsAndroid.PERMISSIONS.RECORD_AUDIO, params, ); - hasRecordAudioPermissions = audioPermissionResult === PermissionsAndroid.RESULTS.GRANTED; + if (typeof audioPermissionResult === 'boolean') { + hasRecordAudioPermissions = audioPermissionResult + } else { + hasRecordAudioPermissions = audioPermissionResult === PermissionsAndroid.RESULTS.GRANTED; + } } else if (__DEV__) { // eslint-disable-next-line no-console console.warn(