From 6b4addad66b5a12a90cfd22f8f87505a3ec3b9e3 Mon Sep 17 00:00:00 2001 From: Manuel Beck Date: Fri, 15 May 2026 12:19:06 +0200 Subject: [PATCH 1/2] chore: cleanup PermissionHelper - AndroidStudio complained about methods not found linked in JavaDoc for the class CordovaInterface: requestPermission(), requestPermissions() and hasPermission(). The parameter types were missing and were added. - Removing unused imports --- .../src/org/apache/cordova/PermissionHelper.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/framework/src/org/apache/cordova/PermissionHelper.java b/framework/src/org/apache/cordova/PermissionHelper.java index 90c6e169f..e054e9438 100644 --- a/framework/src/org/apache/cordova/PermissionHelper.java +++ b/framework/src/org/apache/cordova/PermissionHelper.java @@ -18,12 +18,6 @@ Licensed to the Apache Software Foundation (ASF) under one */ package org.apache.cordova; -import java.util.Arrays; - -import org.json.JSONException; - -import android.content.pm.PackageManager; - /** * This class is permission helper class when compiling against older versions of cordova-android pre 5.0.0 * and provides reflective methods for permission requesting and checking so that plugins @@ -48,7 +42,7 @@ public class PermissionHelper { * @param requestCode A requestCode to be passed to the plugin's onRequestPermissionResult() * along with the result of the permission request * @param permission The permission to be requested - * @deprecated As of cordova-android 5.0.0, use {@link CordovaInterface#requestPermission()} instead. + * @deprecated As of cordova-android 5.0.0, use {@link CordovaInterface#requestPermission(CordovaPlugin, int, String)} instead. */ public static void requestPermission(CordovaPlugin plugin, int requestCode, String permission) { PermissionHelper.requestPermissions(plugin, requestCode, new String[] {permission}); @@ -63,7 +57,7 @@ public static void requestPermission(CordovaPlugin plugin, int requestCode, Stri * @param requestCode A requestCode to be passed to the plugin's onRequestPermissionResult() * along with the result of the permissions request * @param permissions The permissions to be requested - * @deprecated As of cordova-android 5.0.0, use {@link CordovaInterface#requestPermissions()} instead. + * @deprecated As of cordova-android 5.0.0, use {@link CordovaInterface#requestPermissions(CordovaPlugin, int, String[])} instead. */ public static void requestPermissions(CordovaPlugin plugin, int requestCode, String[] permissions) { plugin.cordova.requestPermissions(plugin, requestCode, permissions); @@ -77,7 +71,7 @@ public static void requestPermissions(CordovaPlugin plugin, int requestCode, Str * @param plugin The plugin the permission is being checked against * @param permission The permission to be checked * @return True if the permission has already been granted and false otherwise - * @deprecated As of cordova-android 5.0.0, use {@link CordovaInterface#hasPermission()} instead. + * @deprecated As of cordova-android 5.0.0, use {@link CordovaInterface#hasPermission(String)} instead. */ public static boolean hasPermission(CordovaPlugin plugin, String permission) { return plugin.cordova.hasPermission(permission); From fc9f8a20fbc90a72265332bddb2fbc14a5073553 Mon Sep 17 00:00:00 2001 From: Manuel Beck Date: Fri, 15 May 2026 12:42:49 +0200 Subject: [PATCH 2/2] fix: Add missing `@Deprecated` Java annotations --- framework/src/org/apache/cordova/PermissionHelper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/framework/src/org/apache/cordova/PermissionHelper.java b/framework/src/org/apache/cordova/PermissionHelper.java index e054e9438..924924aed 100644 --- a/framework/src/org/apache/cordova/PermissionHelper.java +++ b/framework/src/org/apache/cordova/PermissionHelper.java @@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one * @deprecated As of cordova-android 5.0.0, this class is no longer needed and will be removed in a future release. * You can call directly into {@link CordovaInterface} methods instead with {@link CordovaPlugin#cordova}. */ +@Deprecated public class PermissionHelper { /** * Requests a "dangerous" permission for the application at runtime. This is a helper method @@ -44,6 +45,7 @@ public class PermissionHelper { * @param permission The permission to be requested * @deprecated As of cordova-android 5.0.0, use {@link CordovaInterface#requestPermission(CordovaPlugin, int, String)} instead. */ + @Deprecated public static void requestPermission(CordovaPlugin plugin, int requestCode, String permission) { PermissionHelper.requestPermissions(plugin, requestCode, new String[] {permission}); } @@ -59,6 +61,7 @@ public static void requestPermission(CordovaPlugin plugin, int requestCode, Stri * @param permissions The permissions to be requested * @deprecated As of cordova-android 5.0.0, use {@link CordovaInterface#requestPermissions(CordovaPlugin, int, String[])} instead. */ + @Deprecated public static void requestPermissions(CordovaPlugin plugin, int requestCode, String[] permissions) { plugin.cordova.requestPermissions(plugin, requestCode, permissions); } @@ -73,6 +76,7 @@ public static void requestPermissions(CordovaPlugin plugin, int requestCode, Str * @return True if the permission has already been granted and false otherwise * @deprecated As of cordova-android 5.0.0, use {@link CordovaInterface#hasPermission(String)} instead. */ + @Deprecated public static boolean hasPermission(CordovaPlugin plugin, String permission) { return plugin.cordova.hasPermission(permission); }