Replace PermissionHelper.java with cordova-plugin-compat

apache · Apr 5, 2016 · a9c1871 · a9c1871
1 parent 624ddd5
commit a9c1871
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 139 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -30,6 +30,8 @@
     <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git</repo>
     <issue>https://issues.apache.org/jira/browse/CB/component/12320645</issue>
 
+    <dependency id="cordova-plugin-compat" version="^1.0.0" />
+
     <js-module src="www/CameraConstants.js" name="Camera">
         <clobbers target="Camera" />
     </js-module>
@@ -71,7 +73,6 @@
         <source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/camera" />
         <source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/camera" />
         <source-file src="src/android/ExifHelper.java" target-dir="src/org/apache/cordova/camera" />
-        <source-file src="src/android/PermissionHelper.java" target-dir="src/org/apache/cordova/camera" />
 
         <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
             <clobbers target="CameraPopoverHandle" />

diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
@@ -34,6 +34,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.CordovaResourceApi;
 import org.apache.cordova.LOG;
+import org.apache.cordova.PermissionHelper;
 import org.apache.cordova.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;

diff --git a/src/android/PermissionHelper.java b/src/android/PermissionHelper.java