Refactoring based on feedback from Andrew

framework/src/org/apache/cordova/CordovaActivity.java

@@ -493,8 +493,7 @@ public class CordovaActivity extends Activity {
     @Override
     public void onRequestPermissionsResult(int requestCode, String permissions[],
                                            int[] grantResults) {
-        PluginManager pm = this.appView.getPluginManager();
+        cordovaInterface.onRequestPermissionResult(requestCode, permissions, grantResults);
-        pm.onRequestPermissionResult(requestCode, permissions, grantResults);
     }
 
 }

framework/src/org/apache/cordova/CordovaInterface.java

@@ -70,5 +70,6 @@ public interface CordovaInterface {
      */
     public ExecutorService getThreadPool();
 
-    public void requestPermission(CordovaPlugin plugin);
+    public void requestPermission(CordovaPlugin plugin, String permission);
+    public void requestPermissions(CordovaPlugin plugin);
 }

framework/src/org/apache/cordova/CordovaInterfaceImpl.java

@@ -38,6 +38,7 @@ public class CordovaInterfaceImpl implements CordovaInterface {
 
     protected ActivityResultHolder savedResult;
     protected CordovaPlugin activityResultCallback;
+    protected CordovaPlugin permissionResultCallback;
     protected String initCallbackService;
     protected int activityResultRequestCode;
 
@@ -162,9 +163,36 @@ public class CordovaInterfaceImpl implements CordovaInterface {
         }
     }
 
-    public void requestPermission(CordovaPlugin plugin)
+    /**
+     * Called by the system when the user grants permissions
+     *
+     * @param requestCode
+     * @param permissions
+     * @param grantResults
+     */
+    public void onRequestPermissionResult(int requestCode, String[] permissions,
+                                          int[] grantResults) {
+        if(permissionResultCallback != null)
         {
-        pluginManager.requestPermission(plugin);
+            permissionResultCallback.onRequestPermissionResult(requestCode, permissions, grantResults);
+            permissionResultCallback = null;
+        }
+    }
+
+    public void requestPermission(CordovaPlugin plugin, String permission) {
+        permissionResultCallback = plugin;
+        String[] permissions = new String [1];
+        permissions[0] = permission;
+        int requestCode = 1;
+        getActivity().requestPermissions(permissions, requestCode);
+    }
+
+    public void requestPermissions(CordovaPlugin plugin)
+    {
+        permissionResultCallback = plugin;
+        String[] permissions = plugin.getPermissionRequest();
+        int requestCode = 1;
+        getActivity().requestPermissions(permissions, requestCode);
     }
 
 }

framework/src/org/apache/cordova/CordovaPlugin.java

@@ -372,13 +372,6 @@ public class CordovaPlugin {
         return permissions;
     }
 
-    /**
-     * requestPermission
-     */
-    public void requestPermission() {
-        cordova.requestPermission(this);
-    }
-
     public boolean hasPermisssion() {
         for(String p : permissions)
         {

framework/src/org/apache/cordova/PluginManager.java

@@ -511,26 +511,4 @@ public class PluginManager {
         }
     }
 
-    /**
-     * Called by the system when the user grants permissions
-     *
-     * @param requestCode
-     * @param permissions
-     * @param grantResults
-     */
-    public void onRequestPermissionResult(int requestCode, String[] permissions,
-                                          int[] grantResults) {
-        if(permissionRequester != null)
-        {
-            permissionRequester.onRequestPermissionResult(requestCode, permissions, grantResults);
-            permissionRequester = null;
-        }
-    }
-
-    public void requestPermission(CordovaPlugin plugin) {
-        permissionRequester = plugin;
-        String[] permissions = plugin.getPermissionRequest();
-        int requestCode = 1;
-        ctx.getActivity().requestPermissions(permissions, requestCode);
-    }
 }