Skip to content

fix(android): remove broad media permissions #295

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

Merged
merged 2 commits into from
Dec 18, 2024
Merged

fix(android): remove broad media permissions #295

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
003ff20
feat(android): remove broad camera permissions
bmarsaud Jun 5, 2024
319bf5c
chore(android): prefer List over ArrayList when possible
bmarsaud Jul 17, 2024
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
3 changes: 0 additions & 3 deletions plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ xmlns:android="http://schemas.android.com/apk/res/android"

<config-file target="AndroidManifest.xml" parent="/*">
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
</config-file>
Expand Down
22 changes: 8 additions & 14 deletions src/android/Capture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Licensed to the Apache Software Foundation (ASF) under one
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.apache.cordova.CallbackContext;
import org.apache.cordova.CordovaPlugin;
Expand Down Expand Up @@ -234,7 +235,7 @@ private JSONObject getAudioVideoData(String filePath, JSONObject obj, boolean vi
return obj;
}

private boolean isMissingPermissions(Request req, ArrayList<String> permissions) {
private boolean isMissingPermissions(Request req, List<String> permissions) {
ArrayList<String> missingPermissions = new ArrayList<>();
for (String permission: permissions) {
if (!PermissionHelper.hasPermission(this, permission)) {
Expand All @@ -250,30 +251,23 @@ private boolean isMissingPermissions(Request req, ArrayList<String> permissions)
return isMissingPermissions;
}

private boolean isMissingPermissions(Request req, String mediaPermission) {
ArrayList<String> permissions = new ArrayList<>(Arrays.asList(storagePermissions));
if (mediaPermission != null && android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
permissions.add(mediaPermission);
}
return isMissingPermissions(req, permissions);
private boolean isMissingPermissions(Request req) {
return isMissingPermissions(req, Arrays.asList(storagePermissions));
}

private boolean isMissingCameraPermissions(Request req, String mediaPermission) {
private boolean isMissingCameraPermissions(Request req) {
ArrayList<String> cameraPermissions = new ArrayList<>(Arrays.asList(storagePermissions));
if (cameraPermissionInManifest) {
cameraPermissions.add(Manifest.permission.CAMERA);
}
if (mediaPermission != null && android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
cameraPermissions.add(mediaPermission);
}
return isMissingPermissions(req, cameraPermissions);
}

/**
* Sets up an intent to capture audio. Result handled by onActivityResult()
*/
private void captureAudio(Request req) {
if (isMissingPermissions(req, Manifest.permission.READ_MEDIA_AUDIO)) return;
if (isMissingPermissions(req)) return;

try {
Intent intent = new Intent(android.provider.MediaStore.Audio.Media.RECORD_SOUND_ACTION);
Expand All @@ -287,7 +281,7 @@ private void captureAudio(Request req) {
* Sets up an intent to capture images. Result handled by onActivityResult()
*/
private void captureImage(Request req) {
if (isMissingCameraPermissions(req, Manifest.permission.READ_MEDIA_IMAGES)) return;
if (isMissingCameraPermissions(req)) return;

// Save the number of images currently on disk for later
this.numPics = queryImgDB(whichContentStore()).getCount();
Expand All @@ -309,7 +303,7 @@ private void captureImage(Request req) {
* Sets up an intent to capture video. Result handled by onActivityResult()
*/
private void captureVideo(Request req) {
if (isMissingCameraPermissions(req, Manifest.permission.READ_MEDIA_VIDEO)) return;
if (isMissingCameraPermissions(req)) return;

Intent intent = new Intent(android.provider.MediaStore.ACTION_VIDEO_CAPTURE);

Expand Down