3
0
mirror of https://github.com/apache/cordova-android.git synced 2025-02-28 22:17:50 +08:00

feat: Deprecated onRequestPermissionResult in favour for onRequestPermissionsResult for consistency ()

This commit is contained in:
Norman Breau 2021-04-13 06:56:04 -03:00 committed by GitHub
parent cab9840a03
commit 6b33772613
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
framework/src/org/apache/cordova

View File

@ -414,9 +414,24 @@ public class CordovaPlugin {
* @param requestCode * @param requestCode
* @param permissions * @param permissions
* @param grantResults * @param grantResults
*
* @deprecated Use {@link #onRequestPermissionsResult} instead.
*/ */
@Deprecated
public void onRequestPermissionResult(int requestCode, String[] permissions, public void onRequestPermissionResult(int requestCode, String[] permissions,
int[] grantResults) throws JSONException { 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 {
}
} }

View File

@ -79,7 +79,9 @@ public class PermissionHelper {
Arrays.fill(requestResults, PackageManager.PERMISSION_GRANTED); Arrays.fill(requestResults, PackageManager.PERMISSION_GRANTED);
try { try {
// This one is deprecated - see https://github.com/apache/cordova-android/issues/592
plugin.onRequestPermissionResult(requestCode, permissions, requestResults); plugin.onRequestPermissionResult(requestCode, permissions, requestResults);
plugin.onRequestPermissionsResult(requestCode, permissions, requestResults);
} catch (JSONException e) { } catch (JSONException e) {
LOG.e(LOG_TAG, "JSONException when delivering permissions results", e); LOG.e(LOG_TAG, "JSONException when delivering permissions results", e);
} }