Skip to content

fix: properly ask for gallery permissions and update errors #18

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

Open
alexgerardojacinto wants to merge 2 commits into
base: feat/RMET-4099/camera-unification
Choose a base branch
from
+43 −8
Open

fix: properly ask for gallery permissions and update errors #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6430454
fix: properly ask for gallery permissions
alexgerardojacinto Mar 26, 2026
fc61c0e
chore: update errors
alexgerardojacinto Mar 26, 2026
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
2 changes: 1 addition & 1 deletion android/src/main/java/com/capacitorjs/plugins/camera/CameraPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class CameraPlugin : Plugin() {
*/
@PermissionCallback
private fun ionCameraPermissionsCallback(call: PluginCall) {
ionFlow.handleCameraPermissionsCallback(call)
ionFlow.handlePermissionsCallback(call)
}

override fun requestPermissionForAliases(
Expand Down
49 changes: 42 additions & 7 deletions android/src/main/java/com/capacitorjs/plugins/camera/IonCameraFlow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ class IonCameraFlow(
sendError(it)
}
} catch (ex: Exception) {
sendError(IONCAMRError.VIDEO_CAPTURE_NOT_SUPPORTED_ERROR)
sendError(IONCAMRError.CAPTURE_VIDEO_ERROR)
}
}
}
Expand All @@ -320,6 +320,8 @@ class IonCameraFlow(
}

private fun openGallery(call: PluginCall) {
if (!checkGalleryPermissions(call)) return

val manager = galleryManager ?: run {
sendError(IONCAMRError.CONTEXT_ERROR)
return
Expand Down Expand Up @@ -540,7 +542,7 @@ class IonCameraFlow(
processResultEditFromGallery(intent)
} else {
lastEditUri = null
sendError(IONCAMRError.EDIT_OPERATION_CANCELLED_ERROR)
sendError(IONCAMRError.EDIT_CANCELLED_ERROR)
}
}
else -> sendError(IONCAMRError.EDIT_IMAGE_ERROR)
Expand Down Expand Up @@ -573,7 +575,7 @@ class IonCameraFlow(
private fun handleEditResult(result: ActivityResult) {
when (result.resultCode) {
Activity.RESULT_OK -> processResultFromEdit(result)
Activity.RESULT_CANCELED -> sendError(IONCAMRError.EDIT_OPERATION_CANCELLED_ERROR)
Activity.RESULT_CANCELED -> sendError(IONCAMRError.EDIT_CANCELLED_ERROR)
else -> sendError(IONCAMRError.EDIT_IMAGE_ERROR)
}
}
Expand Down Expand Up @@ -698,7 +700,7 @@ class IonCameraFlow(
processResult(intent)
} else {
lastEditUri = null
sendError(IONCAMRError.EDIT_OPERATION_CANCELLED_ERROR)
sendError(IONCAMRError.EDIT_CANCELLED_ERROR)
}
}
else -> sendError(IONCAMRError.EDIT_IMAGE_ERROR)
Expand Down Expand Up @@ -984,13 +986,46 @@ class IonCameraFlow(
return true
}

fun handleCameraPermissionsCallback(call: PluginCall) {
if (permissionHelper.getPermissionState(CAMERA) != PermissionState.GRANTED) {
private fun checkGalleryPermissions(call: PluginCall): Boolean {
// Android 10+ does not require storage permissions to use the system gallery picker
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
return true
}
val needGalleryPerms = permissionHelper.isPermissionDeclared(SAVE_GALLERY)
val hasGalleryPerms = !needGalleryPerms || permissionHelper.getPermissionState(SAVE_GALLERY) == PermissionState.GRANTED
if (!hasGalleryPerms) {
permissionHelper.requestPermissionForAlias(SAVE_GALLERY, call, "ionCameraPermissionsCallback")
return false
}
return true
}

fun handlePermissionsCallback(call: PluginCall) {
// chooseFromGallery does not require CAMERA permission
if (call.methodName != "chooseFromGallery" &&
permissionHelper.getPermissionState(CAMERA) != PermissionState.GRANTED) {
sendError(IONCAMRError.CAMERA_PERMISSION_DENIED_ERROR)
return
}

when (call.getMethodName()) {
// On Android <= 9, SAVE_GALLERY (READ/WRITE_EXTERNAL_STORAGE) is required:
// - for takePhoto/recordVideo when saveToGallery is true
// - always for chooseFromGallery (READ_EXTERNAL_STORAGE is needed to access the gallery)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
val needsGalleryPerm = when (call.methodName) {
"takePhoto" -> cameraSettings?.saveToGallery ?: false
"recordVideo" -> videoParameters?.saveToGallery ?: false
"chooseFromGallery" -> true
else -> false
}
val galleryPermDeclared = permissionHelper.isPermissionDeclared(SAVE_GALLERY)
if (needsGalleryPerm && galleryPermDeclared && permissionHelper.getPermissionState(SAVE_GALLERY) != PermissionState.GRANTED) {
sendError(IONCAMRError.GALLERY_PERMISSION_DENIED_ERROR)
return
}
}

when (call.methodName) {
"takePhoto" -> openCamera(call)
"recordVideo" -> openRecordVideo(call)
"chooseFromGallery" -> openGallery(call)
Expand Down
Loading