diff --git a/framework/src/org/apache/cordova/PermissionHelper.java b/framework/src/org/apache/cordova/PermissionHelper.java index 90c6e169f..924924aed 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 @@ -38,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 @@ -48,8 +43,9 @@ 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. */ + @Deprecated public static void requestPermission(CordovaPlugin plugin, int requestCode, String permission) { PermissionHelper.requestPermissions(plugin, requestCode, new String[] {permission}); } @@ -63,8 +59,9 @@ 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. */ + @Deprecated public static void requestPermissions(CordovaPlugin plugin, int requestCode, String[] permissions) { plugin.cordova.requestPermissions(plugin, requestCode, permissions); } @@ -77,8 +74,9 @@ 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. */ + @Deprecated public static boolean hasPermission(CordovaPlugin plugin, String permission) { return plugin.cordova.hasPermission(permission); }