Skip to content

chore: sync upstream PR #8400 - fix(android): add null check for plugin annotation in getPermissionStates #92

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
riderx wants to merge 2 commits into
base: plus
Choose a base branch
from
Open

chore: sync upstream PR #8400 - fix(android): add null check for plugin annotation in getPermissionStates #92

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a88318
fix(android): add null check for plugin annotation in getPermissionSt…
robingenz Mar 24, 2026
3b60d72
chore: sync upstream PR #8400 from @robingenz
Jul 14, 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
66 changes: 34 additions & 32 deletions android/capacitor/src/main/java/com/getcapacitor/Bridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,42 +1214,44 @@ protected boolean validatePermissions(Plugin plugin, PluginCall savedCall, Map<S
protected Map<String, PermissionState> getPermissionStates(Plugin plugin) {
Map<String, PermissionState> permissionsResults = new HashMap<>();
CapacitorPlugin annotation = plugin.getPluginHandle().getPluginAnnotation();
for (Permission perm : annotation.permissions()) {
// If a permission is defined with no permission constants, return GRANTED for it.
// Otherwise, get its true state.
if (perm.strings().length == 0 || (perm.strings().length == 1 && perm.strings()[0].isEmpty())) {
String key = perm.alias();
if (!key.isEmpty()) {
PermissionState existingResult = permissionsResults.get(key);

// auto set permission state to GRANTED if the alias is empty.
if (existingResult == null) {
permissionsResults.put(key, PermissionState.GRANTED);
}
}
} else {
for (String permString : perm.strings()) {
String key = perm.alias().isEmpty() ? permString : perm.alias();
PermissionState permissionStatus;
if (ActivityCompat.checkSelfPermission(this.getContext(), permString) == PackageManager.PERMISSION_GRANTED) {
permissionStatus = PermissionState.GRANTED;
} else {
permissionStatus = PermissionState.PROMPT;

// Check if there is a cached permission state for the "Never ask again" state
SharedPreferences prefs = getContext().getSharedPreferences(PERMISSION_PREFS_NAME, Activity.MODE_PRIVATE);
String state = prefs.getString(permString, null);

if (state != null) {
permissionStatus = PermissionState.byState(state);
if (annotation != null) {
for (Permission perm : annotation.permissions()) {
// If a permission is defined with no permission constants, return GRANTED for it.
// Otherwise, get its true state.
if (perm.strings().length == 0 || (perm.strings().length == 1 && perm.strings()[0].isEmpty())) {
String key = perm.alias();
if (!key.isEmpty()) {
PermissionState existingResult = permissionsResults.get(key);

// auto set permission state to GRANTED if the alias is empty.
if (existingResult == null) {
permissionsResults.put(key, PermissionState.GRANTED);
}
}
} else {
for (String permString : perm.strings()) {
String key = perm.alias().isEmpty() ? permString : perm.alias();
PermissionState permissionStatus;
if (ActivityCompat.checkSelfPermission(this.getContext(), permString) == PackageManager.PERMISSION_GRANTED) {
permissionStatus = PermissionState.GRANTED;
} else {
permissionStatus = PermissionState.PROMPT;

// Check if there is a cached permission state for the "Never ask again" state
SharedPreferences prefs = getContext().getSharedPreferences(PERMISSION_PREFS_NAME, Activity.MODE_PRIVATE);
String state = prefs.getString(permString, null);

if (state != null) {
permissionStatus = PermissionState.byState(state);
}
}

PermissionState existingResult = permissionsResults.get(key);
PermissionState existingResult = permissionsResults.get(key);

// multiple permissions with the same alias must all be true, otherwise all false.
if (existingResult == null || existingResult == PermissionState.GRANTED) {
permissionsResults.put(key, permissionStatus);
// multiple permissions with the same alias must all be true, otherwise all false.
if (existingResult == null || existingResult == PermissionState.GRANTED) {
permissionsResults.put(key, permissionStatus);
}
}
}
}
Expand Down
Loading