chore: update plugins to 3.0.0-alpha.14 (#188)

ionic-team · Jan 13, 2021 · 6be5d7d · 6be5d7d
1 parent 2c3776c
commit 6be5d7d
Show file tree

Hide file tree

Showing 25 changed files with 66 additions and 70 deletions.
diff --git a/action-sheet/package.json b/action-sheet/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/app-launcher/package.json b/app-launcher/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/app/package.json b/app/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/browser/package.json b/browser/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/camera/android/src/main/java/com/capacitorjs/plugins/camera/CameraPlugin.java b/camera/android/src/main/java/com/capacitorjs/plugins/camera/CameraPlugin.java
@@ -138,8 +138,8 @@ private void showPhotos(final PluginCall call) {
     private boolean checkCameraPermissions(PluginCall call) {
         // if the manifest does not contain the camera permissions key, we don't need to ask the user
         boolean needCameraPerms = hasDefinedPermissions(new String[] { Manifest.permission.CAMERA });
-        boolean hasCameraPerms = !needCameraPerms || hasPermission(Manifest.permission.CAMERA);
-        boolean hasPhotoPerms = hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+        boolean hasCameraPerms = !needCameraPerms || getPermissionState("camera") == PermissionState.GRANTED;
+        boolean hasPhotoPerms = getPermissionState("photos") == PermissionState.GRANTED;
 
         // If we want to save to the gallery, we need two permissions
         if (settings.isSaveToGallery() && !(hasCameraPerms && hasPhotoPerms)) {
@@ -161,7 +161,7 @@ else if (!hasCameraPerms) {
     }
 
     private boolean checkPhotosPermissions(PluginCall call) {
-        if (!hasPermission(Manifest.permission.READ_EXTERNAL_STORAGE)) {
+        if (getPermissionState("photos") != PermissionState.GRANTED) {
             requestPermissionForAlias("photos", call);
             return false;
         }
@@ -173,15 +173,14 @@ private boolean checkPhotosPermissions(PluginCall call) {
      *
      * @see #getPhoto(PluginCall)
      * @param call the plugin call
-     * @param permissionStatus the results of the permission request
      */
-    private void cameraPermissionsCallback(PluginCall call, Map<String, PermissionState> permissionStatus) {
-        if (settings.getSource() == CameraSource.CAMERA && permissionStatus.get("camera") == PermissionState.DENIED) {
-            Logger.debug(getLogTag(), "User denied camera permission: " + permissionStatus.toString());
+    private void cameraPermissionsCallback(PluginCall call) {
+        if (settings.getSource() == CameraSource.CAMERA && getPermissionState("camera") != PermissionState.GRANTED) {
+            Logger.debug(getLogTag(), "User denied camera permission: " + getPermissionState("camera").toString());
             call.reject(PERMISSION_DENIED_ERROR);
             return;
-        } else if (settings.getSource() == CameraSource.PHOTOS && permissionStatus.get("photos") == PermissionState.DENIED) {
-            Logger.debug(getLogTag(), "User denied photos permission: " + permissionStatus.toString());
+        } else if (settings.getSource() == CameraSource.PHOTOS && getPermissionState("photos") != PermissionState.GRANTED) {
+            Logger.debug(getLogTag(), "User denied photos permission: " + getPermissionState("photos").toString());
             call.reject(PERMISSION_DENIED_ERROR);
             return;
         }

diff --git a/camera/package.json b/camera/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/clipboard/package.json b/clipboard/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/device/package.json b/device/package.json
@@ -45,10 +45,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/dialog/package.json b/dialog/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/filesystem/android/src/main/java/com/capacitorjs/plugins/filesystem/FilesystemPlugin.java b/filesystem/android/src/main/java/com/capacitorjs/plugins/filesystem/FilesystemPlugin.java
@@ -17,7 +17,6 @@
 import com.getcapacitor.annotation.Permission;
 import java.io.*;
 import java.nio.charset.Charset;
-import java.util.Map;
 import org.json.JSONException;
 
 @CapacitorPlugin(
@@ -349,8 +348,8 @@ private void _copy(PluginCall call, Boolean doRename) {
         }
     }
 
-    private void readPermissionsCallback(PluginCall call, Map<String, PermissionState> status) {
-        if (status.get(READ_STORAGE) != PermissionState.GRANTED) {
+    private void readPermissionsCallback(PluginCall call) {
+        if (getPermissionState(READ_STORAGE) != PermissionState.GRANTED) {
             Logger.debug(getLogTag(), "User denied read storage permission");
             call.reject(PERMISSION_DENIED_ERROR);
             return;
@@ -372,8 +371,8 @@ private void readPermissionsCallback(PluginCall call, Map<String, PermissionStat
         }
     }
 
-    private void writePermissionsCallback(PluginCall call, Map<String, PermissionState> status) {
-        if (status.get(WRITE_STORAGE) != PermissionState.GRANTED) {
+    private void writePermissionsCallback(PluginCall call) {
+        if (getPermissionState(WRITE_STORAGE) != PermissionState.GRANTED) {
             Logger.debug(getLogTag(), "User denied write storage permission");
             call.reject(PERMISSION_DENIED_ERROR);
             return;
@@ -408,7 +407,7 @@ private void writePermissionsCallback(PluginCall call, Map<String, PermissionSta
      * @return Returns true if the permission is granted and false if it is denied.
      */
     private boolean isStoragePermissionGranted(String alias) {
-        return getPermissionStates().get(alias) == PermissionState.GRANTED;
+        return getPermissionState(alias) == PermissionState.GRANTED;
     }
 
     /**

diff --git a/filesystem/package.json b/filesystem/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/geolocation/android/src/main/java/com/capacitorjs/plugins/geolocation/GeolocationPlugin.java b/geolocation/android/src/main/java/com/capacitorjs/plugins/geolocation/GeolocationPlugin.java
@@ -31,7 +31,7 @@ public void load() {
 
     /**
      * Gets a snapshot of the current device position if permission is granted. The call continues
-     * in the {@link #completeCurrentPosition(PluginCall, Map)} method if a permission request is required.
+     * in the {@link #completeCurrentPosition(PluginCall)} method if a permission request is required.
      *
      * @param call Plugin call
      */
@@ -48,10 +48,9 @@ public void getCurrentPosition(final PluginCall call) {
      * Completes the getCurrentPosition plugin call after a permission request
      * @see #getCurrentPosition(PluginCall)
      * @param call the plugin call
-     * @param status the results of the permission request
      */
-    private void completeCurrentPosition(PluginCall call, Map<String, PermissionState> status) {
-        if (status.get("location") == PermissionState.GRANTED) {
+    private void completeCurrentPosition(PluginCall call) {
+        if (getPermissionState("location") == PermissionState.GRANTED) {
             boolean enableHighAccuracy = call.getBoolean("enableHighAccuracy", false);
             int timeout = call.getInt("timeout", 10000);
 
@@ -78,7 +77,7 @@ public void error(String message) {
 
     /**
      * Begins watching for live location changes if permission is granted. The call continues
-     * in the {@link #completeWatchPosition(PluginCall, Map)} method if a permission request is required.
+     * in the {@link #completeWatchPosition(PluginCall)} method if a permission request is required.
      *
      * @param call the plugin call
      */
@@ -96,10 +95,9 @@ public void watchPosition(PluginCall call) {
      * Completes the watchPosition plugin call after a permission request
      * @see #watchPosition(PluginCall)
      * @param call the plugin call
-     * @param status the results of the permission request
      */
-    private void completeWatchPosition(PluginCall call, Map<String, PermissionState> status) {
-        if (status.get("location") == PermissionState.GRANTED) {
+    private void completeWatchPosition(PluginCall call) {
+        if (getPermissionState("location") == PermissionState.GRANTED) {
             startWatch(call);
         } else {
             call.reject("Location permission was denied");

diff --git a/geolocation/package.json b/geolocation/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/haptics/package.json b/haptics/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/keyboard/package.json b/keyboard/package.json
@@ -44,11 +44,11 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
-    "@capacitor/cli": "^3.0.0-alpha.13",
+    "@capacitor/android": "^3.0.0-alpha.14",
+    "@capacitor/cli": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/motion/package.json b/motion/package.json
@@ -39,10 +39,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "eslint": "^7.11.0",

diff --git a/network/package.json b/network/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/push-notifications/package.json b/push-notifications/package.json
@@ -44,11 +44,11 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
-    "@capacitor/cli": "^3.0.0-alpha.13",
+    "@capacitor/android": "^3.0.0-alpha.14",
+    "@capacitor/cli": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/screen-reader/package.json b/screen-reader/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/share/package.json b/share/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/splash-screen/package.json b/splash-screen/package.json
@@ -44,11 +44,11 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
-    "@capacitor/cli": "^3.0.0-alpha.13",
+    "@capacitor/android": "^3.0.0-alpha.14",
+    "@capacitor/cli": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/status-bar/package.json b/status-bar/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",

diff --git a/storage/package.json b/storage/package.json
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0-alpha.12",
+    "@capacitor/android": "^3.0.0-alpha.14",
     "@capacitor/core": "^3.0.0-alpha.12",
     "@capacitor/docgen": "0.0.14",
-    "@capacitor/ios": "^3.0.0-alpha.13",
+    "@capacitor/ios": "^3.0.0-alpha.14",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",