diff --git a/framework/src/org/apache/cordova/CordovaPlugin.java b/framework/src/org/apache/cordova/CordovaPlugin.java index 41af1db7..46fd2fa4 100644 --- a/framework/src/org/apache/cordova/CordovaPlugin.java +++ b/framework/src/org/apache/cordova/CordovaPlugin.java @@ -414,9 +414,24 @@ public class CordovaPlugin { * @param requestCode * @param permissions * @param grantResults + * + * @deprecated Use {@link #onRequestPermissionsResult} instead. */ + @Deprecated public void onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults) throws JSONException { } + + /** + * Called by the system when the user grants permissions + * + * @param requestCode + * @param permissions + * @param grantResults + */ + public void onRequestPermissionsResult(int requestCode, String[] permissions, + int[] grantResults) throws JSONException { + + } } diff --git a/framework/src/org/apache/cordova/PermissionHelper.java b/framework/src/org/apache/cordova/PermissionHelper.java index 52f6e140..b2e4023c 100644 --- a/framework/src/org/apache/cordova/PermissionHelper.java +++ b/framework/src/org/apache/cordova/PermissionHelper.java @@ -79,7 +79,9 @@ public class PermissionHelper { Arrays.fill(requestResults, PackageManager.PERMISSION_GRANTED); try { + // This one is deprecated - see https://github.com/apache/cordova-android/issues/592 plugin.onRequestPermissionResult(requestCode, permissions, requestResults); + plugin.onRequestPermissionsResult(requestCode, permissions, requestResults); } catch (JSONException e) { LOG.e(LOG_TAG, "JSONException when delivering permissions results", e); }