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): Use plugin's getPermissionStates() to support overriding #3939

Merged
merged 3 commits into from
Dec 13, 2020
Merged

fix(Android): Use plugin's getPermissionStates() to support overriding #3939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b57d2f
Use plugin getPermissionStates in case it is overridden
carlpoole Dec 11, 2020
c20058c
Merge branch 'main' into perm-states
imhoffd Dec 11, 2020
d0c15d2
Merge branch 'main' into perm-states
imhoffd Dec 12, 2020
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/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 @@ -789,7 +789,7 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
if (validatePermissions(plugin.getInstance(), savedPermissionCall, permissions, grantResults)) {
// handle request permissions call
if (savedPermissionCall.getMethodName().equals("requestPermissions")) {
savedPermissionCall.resolve(getPermissionStates(plugin.getInstance()));
savedPermissionCall.resolve(plugin.getInstance().getPermissionStates());
} else {
// handle permission requests by other methods on the plugin
plugin.getInstance().onRequestPermissionsResult(savedPermissionCall, requestCode, permissions, grantResults);
Expand Down
2 changes: 1 addition & 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 @@ -494,7 +494,7 @@ public void removeAllListeners(PluginCall call) {
*/
@PluginMethod
public void checkPermissions(PluginCall pluginCall) {
JSObject permissionsResult = bridge.getPermissionStates(this);
JSObject permissionsResult = getPermissionStates();

if (permissionsResult.length() == 0) {
// if no permissions are defined on the plugin, resolve undefined
Expand Down