Skip to content
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

fix(android): resolve undefined for both checkPermissions and requestPermissions by default #3855

Merged
merged 1 commit into from
Nov 24, 2020
Merged

fix(android): resolve undefined for both checkPermissions and requestPermissions by default #3855

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion android/capacitor/src/main/java/com/getcapacitor/Plugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,13 @@ public boolean hasRequiredPermissions() {
@PluginMethod
public void checkPermissions(PluginCall pluginCall) {
JSObject permissionsResult = getPermissionStates();
pluginCall.resolve(permissionsResult);

if (permissionsResult.length() == 0) {
// if no permissions are defined on the plugin, resolve undefined
pluginCall.resolve();
} else {
pluginCall.resolve(permissionsResult);
}
}

/**
Expand Down Expand Up @@ -561,6 +567,7 @@ public void requestPermissions(PluginCall call) {

call.resolve(permissionsResults);
} else {
// no permissions are defined on the plugin, resolve undefined
call.resolve();
}
}
Expand Down