Skip to content

Call new method CordovaPlugin.onRequestPermissionsResult #1855

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

Call new method CordovaPlugin.onRequestPermissionsResult #1855

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion framework/src/org/apache/cordova/CordovaActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ public void onRequestPermissionsResult(int requestCode, String permissions[],

try
{
cordovaInterface.onRequestPermissionResult(requestCode, permissions, grantResults);
cordovaInterface.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
catch (JSONException e)
{
Expand Down
6 changes: 5 additions & 1 deletion framework/src/org/apache/cordova/CordovaInterfaceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,15 @@ public ActivityResultHolder(int requestCode, int resultCode, Intent intent) {
* @param permissions
* @param grantResults
*/
public void onRequestPermissionResult(int requestCode, String[] permissions,
public void onRequestPermissionsResult(int requestCode, String[] permissions,
int[] grantResults) throws JSONException {
Pair<CordovaPlugin, Integer> callback = permissionResultCallbacks.getAndRemoveCallback(requestCode);
if(callback != null) {
// This one is deprecated - see https://github.com/apache/cordova-android/issues/592
// and should be removed in a future release
callback.first.onRequestPermissionResult(callback.second, permissions, grantResults);
// Call the new method
callback.first.onRequestPermissionsResult(callback.second, permissions, grantResults);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/androidx/app/src/main/java/org/apache/cordova/unittests/EmbeddedWebViewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
* Called by the system when the user grants permissions!
*
* Note: The fragment gets priority over the activity, since the activity doesn't call
* into the parent onRequestPermissionResult, which is why there's no override.
* into the parent onRequestPermissionsResult, which is why there's no override.
*
* @param requestCode
* @param permissions
Expand All @@ -98,7 +98,7 @@ public void onRequestPermissionsResult(int requestCode, String permissions[],
int[] grantResults) {
try
{
cordovaInterface.onRequestPermissionResult(requestCode, permissions, grantResults);
cordovaInterface.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
catch (JSONException e)
{
Expand Down