cordova.plugins.diagnostic 7.1.2 → 7.1.4

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # CHANGELOG
 
+**v7.1.4**
+* (android) bugfix: decide if a permission is implicitly granted by checking if the device runtime is less than, but the build SDK used for the app is greater is or equal than, the SDK version in which the permission was added.
+  * Resolves [#508](https://github.com/dpa99c/cordova-diagnostic-plugin/issues/508)
+* (android) tweak: throw error if a requested runtime permission is not supported by the build SDK version
+* (android) bugfix: when requesting camera permission, storage permission should also be requested by default if not specified but is currently not being
+
+
+**v7.1.3**
+* (android) update camera module to support READ_MEDIA permissions on Android 13+
+* (android): For new runtime permissions added in API 33, consider them implicitly granted if the build SDK >= 33 and device runtime is < 33.
+  * Resolves [#493](https://github.com/dpa99c/cordova-diagnostic-plugin/issues/493)
+* (android) fix: Return error if attempting to change Bluetooth state when build SDK >= API 33 as this is no longer support.
+  * Resolves [#496](https://github.com/dpa99c/cordova-diagnostic-plugin/issues/496)
+* (android) fix: getExternalSdCardDetails on API 33
+  * Merged from PR [#495](https://github.com/dpa99c/cordova-diagnostic-plugin/pull/495)
+* (types) Using unlimited arrays in the TypeScript definition
+  * Merged from PR [#497](https://github.com/dpa99c/cordova-diagnostic-plugin/pull/497)    
+
+
 **v7.1.2**
 * (Android) fix: Data roaming setting not available on API 32+
 * (Android) Support new media storage permissions on Android 13 / API 33.

package/README.md

@@ -2194,13 +2194,11 @@ Notes:
 - On Android & iOS this returns true if the device has a camera AND the application is authorized to use it.
 
 Notes for Android:
-- On Android by default this checks run-time permission for both `READ_EXTERNAL_STORAGE` and `CAMERA` because [cordova-plugin-camera@2.2+](https://github.com/apache/cordova-plugin-camera) requires both of these permissions.
-- The call signature `cordova.plugins.diagnostic.isCameraAvailable(successCallback, errorCallback, externalStorage)` is also supported for benefit of the [ionic-native Promise API wrapper](https://github.com/driftyco/ionic-native/blob/master/src/%40ionic-native/plugins/diagnostic/index.ts).
+- By default this also checks run-time storage permissions in addition to `CAMERA` permission because [cordova-plugin-camera](https://github.com/apache/cordova-plugin-camera) requires both of these permission sets.
+  - On Android 13+, storage permissions are `READ_MEDIA_IMAGES` and `READ_MEDIA_VIDEO`. On Android 12 and below, storage permissions are `READ_EXTERNAL_STORAGE` and `WRITE_EXTERNAL_STORAGE`.
 
 ```
-cordova.plugins.diagnostic.isCameraAvailable(params);
-cordova.plugins.diagnostic.isCameraAvailable(successCallback, errorCallback, params)
-cordova.plugins.diagnostic.isCameraAvailable(successCallback, errorCallback, externalStorage)
+cordova.plugins.diagnostic.isCameraAvailable(successCallback, errorCallback, storage)
 ```
 
 #### Parameters
@@ -2209,32 +2207,11 @@ cordova.plugins.diagnostic.isCameraAvailable(successCallback, errorCallback, ext
 The function is passed a single boolean parameter which is TRUE if camera is present and authorized for use.
     - {Function} errorCallback -  The callback which will be called when operation encounters an error.
 The function is passed a single string parameter containing the error message.
-    - {Boolean} externalStorage - (Android only) If true, checks permission for `READ_EXTERNAL_STORAGE` in addition to `CAMERA` run-time permission.
-Defaults to true.
+  - {Boolean} storage - (Android only) If true, requests storage permissions in addition to `CAMERA` run-time permission. Defaults to true.
 
 
 #### Example usage
 
-    cordova.plugins.diagnostic.isCameraAvailable({
-        successCallback: function(available){
-            console.log("Camera is " + (available ? "available" : "not available"));
-        },
-        errorCallback: function(error){
-            console.error("The following error occurred: "+error);
-        },
-        externalStorage: false
-    });
-
-    cordova.plugins.diagnostic.isCameraAvailable(
-        function(available){
-            console.log("Camera is " + (available ? "available" : "not available"));
-        }, function(error){
-            console.error("The following error occurred: "+error);
-        }, {
-            externalStorage: false
-        }
-    );
-
     cordova.plugins.diagnostic.isCameraAvailable(
         function(available){
             console.log("Camera is " + (available ? "available" : "not available"));
@@ -2251,13 +2228,11 @@ Checks if the application is authorized to use the camera.
 
 Notes for Android:
 - This is intended for Android 6 / API 23 and above. Calling on Android 5.1 / API 22 and below will always return TRUE as permissions are already granted at installation time.
-- By default this checks run-time permission for both `READ_EXTERNAL_STORAGE` and `CAMERA` because [cordova-plugin-camera@2.2+](https://github.com/apache/cordova-plugin-camera) requires both of these permissions.
-- The call signature `cordova.plugins.diagnostic.isCameraAuthorized(successCallback, errorCallback, externalStorage)` is also supported for benefit of the [ionic-native Promise API wrapper](https://github.com/driftyco/ionic-native/blob/master/src/%40ionic-native/plugins/diagnostic/index.ts).
+- By default this also checks run-time storage permissions in addition to `CAMERA` permission because [cordova-plugin-camera](https://github.com/apache/cordova-plugin-camera) requires both of these permission sets.
+  - On Android 13+, storage permissions are `READ_MEDIA_IMAGES` and `READ_MEDIA_VIDEO`. On Android 12 and below, storage permissions are `READ_EXTERNAL_STORAGE` and `WRITE_EXTERNAL_STORAGE`.
 
 ```
-cordova.plugins.diagnostic.isCameraAuthorized(params);
-cordova.plugins.diagnostic.isCameraAuthorized(successCallback, errorCallback, params)
-cordova.plugins.diagnostic.isCameraAuthorized(successCallback, errorCallback, externalStorage)
+cordova.plugins.diagnostic.isCameraAuthorized(successCallback, errorCallback, storage)
 ```
 
 #### Parameters
@@ -2266,31 +2241,10 @@ cordova.plugins.diagnostic.isCameraAuthorized(successCallback, errorCallback, ex
 The function is passed a single boolean parameter which is TRUE if camera is authorized for use.
     - {Function} errorCallback -  The callback which will be called when operation encounters an error.
 The function is passed a single string parameter containing the error message.
-    - {Boolean} externalStorage - (Android only) If true, checks permission for `READ_EXTERNAL_STORAGE` in addition to `CAMERA` run-time permission.
-Defaults to true.
+  - {Boolean} storage - (Android only) If true, requests storage permissions in addition to `CAMERA` run-time permission. Defaults to true.
 
 #### Example usage
 
-    cordova.plugins.diagnostic.isCameraAuthorized({
-        successCallback: function(authorized){
-            console.log("App is " + (authorized ? "authorized" : "denied") + " access to the camera");
-        },
-        errorCallback: function(error){
-            console.error("The following error occurred: "+error);
-        },
-        externalStorage: false
-    });
-
-    cordova.plugins.diagnostic.isCameraAuthorized(
-        function(authorized){
-            console.log("App is " + (authorized ? "authorized" : "denied") + " access to the camera");
-        }, function(error){
-            console.error("The following error occurred: "+error);
-        }, {
-            externalStorage: false
-        }
-    );
-
     cordova.plugins.diagnostic.isCameraAuthorized(
         function(authorized){
             console.log("App is " + (authorized ? "authorized" : "denied") + " access to the camera");
@@ -2307,13 +2261,11 @@ Returns the camera authorization status for the application.
 
 Notes for Android:
 - This is intended for Android 6 / API 23 and above. Calling on Android 5.1 / API 22 and below will always return GRANTED status as permissions are already granted at installation time.
-- By default this checks run-time permission for both `READ_EXTERNAL_STORAGE` and `CAMERA` because [cordova-plugin-camera@2.2+](https://github.com/apache/cordova-plugin-camera) requires both of these permissions.
-- The call signature `cordova.plugins.diagnostic.getCameraAuthorizationStatus(successCallback, errorCallback, externalStorage)` is also supported for benefit of the [ionic-native Promise API wrapper](https://github.com/driftyco/ionic-native/blob/master/src/%40ionic-native/plugins/diagnostic/index.ts).
+- By default this also checks run-time storage permissions in addition to `CAMERA` permission because [cordova-plugin-camera](https://github.com/apache/cordova-plugin-camera) requires both of these permission sets.
+  - On Android 13+, storage permissions are `READ_MEDIA_IMAGES` and `READ_MEDIA_VIDEO`. On Android 12 and below, storage permissions are `READ_EXTERNAL_STORAGE` and `WRITE_EXTERNAL_STORAGE`.
 
 ```
-cordova.plugins.diagnostic.getCameraAuthorizationStatus(params);
-cordova.plugins.diagnostic.getCameraAuthorizationStatus(successCallback, errorCallback, params)
-cordova.plugins.diagnostic.getCameraAuthorizationStatus(successCallback, errorCallback, externalStorage)
+cordova.plugins.diagnostic.getCameraAuthorizationStatus(successCallback, errorCallback, storage)
 ```
 
 #### Parameters
@@ -2322,36 +2274,11 @@ cordova.plugins.diagnostic.getCameraAuthorizationStatus(successCallback, errorCa
 The function is passed a single string parameter which indicates the authorization status as a [permissionStatus constant](#permissionstatus-constants).
     - {Function} errorCallback -  The callback which will be called when operation encounters an error.
 The function is passed a single string parameter containing the error message.
-    - {Boolean} externalStorage - (Android only) If true, checks permission for `READ_EXTERNAL_STORAGE` in addition to `CAMERA` run-time permission.
-Defaults to true.
+  - {Boolean} storage - (Android only) If true, requests storage permissions in addition to `CAMERA` run-time permission. Defaults to true.
 
 
 #### Example usage
 
-    cordova.plugins.diagnostic.getCameraAuthorizationStatus({
-        successCallback: function(status){
-            if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-                console.log("Camera use is authorized");
-            }
-        },
-        errorCallback: function(error){
-            console.error("The following error occurred: "+error);
-        },
-        externalStorage: false
-    });
-
-    cordova.plugins.diagnostic.getCameraAuthorizationStatus(
-        function(status){
-            if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
-                console.log("Camera use is authorized");
-            }
-        }, function(error){
-            console.error("The following error occurred: "+error);
-        }, {
-            externalStorage: false
-        }
-    );
-
     cordova.plugins.diagnostic.getCameraAuthorizationStatus(
         function(status){
             if(status === cordova.plugins.diagnostic.permissionStatus.GRANTED){
@@ -2376,49 +2303,25 @@ this plugin provides a default message, but you should override this with your s
 
 Notes for Android:
 - This is intended for Android 6 / API 23 and above. Calling on Android 5.1 / API 22 and below will have no effect as the permissions are already granted at installation time.
-- By default this requests run-time permission for both `READ_EXTERNAL_STORAGE` and `CAMERA` because [cordova-plugin-camera@2.2+](https://github.com/apache/cordova-plugin-camera) requires both of these permissions.
+- By default this requests run-time storage permissions in addition to `CAMERA` permission because [cordova-plugin-camera](https://github.com/apache/cordova-plugin-camera) requires both of these permission sets.
+  - On Android 13+, storage permissions are `READ_MEDIA_IMAGES` and `READ_MEDIA_VIDEO`. On Android 12 and below, storage permissions are `READ_EXTERNAL_STORAGE` and `WRITE_EXTERNAL_STORAGE`.
 - Requested run-time permissions which must be added to `AndroidManifest.xml` - see [Android camera permissions](#android-camera-permissions).
-- The call signature `cordova.plugins.diagnostic.requestCameraAuthorization(successCallback, errorCallback, externalStorage)` is also supported for benefit of the [ionic-native Promise API wrapper](https://github.com/driftyco/ionic-native/blob/master/src/%40ionic-native/plugins/diagnostic/index.ts).
 
 ```
-cordova.plugins.diagnostic.requestCameraAuthorization(params);
-cordova.plugins.diagnostic.requestCameraAuthorization(successCallback, errorCallback, params)
-cordova.plugins.diagnostic.requestCameraAuthorization(successCallback, errorCallback, externalStorage)
+cordova.plugins.diagnostic.requestCameraAuthorization(successCallback, errorCallback, storage)
 ```
 
 #### Parameters
 
 - {Object} params - (optional) parameters:
     - {Function} successCallback -  The callback which will be called when operation is successful.
-The function is passed a single string parameter indicating whether access to the camera was granted or denied:
-`cordova.plugins.diagnostic.permissionStatus.GRANTED` or `cordova.plugins.diagnostic.permissionStatus.DENIED_ALWAYS`
+The function is passed a single string parameter indicating the resulting permission status.
     - {Function} errorCallback -  The callback which will be called when operation encounters an error.
 The function is passed a single string parameter containing the error message.
-    - {Boolean} externalStorage - (Android only) If true, requests permission for `READ_EXTERNAL_STORAGE` in addition to `CAMERA` run-time permission.
-    Defaults to true.
+    - {Boolean} storage - (Android only) If true, requests storage permissions in addition to `CAMERA` run-time permission. Defaults to true.
 
 #### Example usage
 
-    cordova.plugins.diagnostic.requestCameraAuthorization({
-        successCallback: function(status){
-            console.log("Authorization request for camera use was " + (status == cordova.plugins.diagnostic.permissionStatus.GRANTED ? "granted" : "denied"));
-        },
-        errorCallback: function(error){
-            console.error(error);
-        },
-        externalStorage: false
-    });
-
-    cordova.plugins.diagnostic.requestCameraAuthorization(
-        function(status){
-            console.log("Authorization request for camera use was " + (status == cordova.plugins.diagnostic.permissionStatus.GRANTED ? "granted" : "denied"));
-        }, function(error){
-            console.error("The following error occurred: "+error);
-        }, {
-            externalStorage: false
-        }
-    );
-
     cordova.plugins.diagnostic.requestCameraAuthorization(
         function(status){
             console.log("Authorization request for camera use was " + (status == cordova.plugins.diagnostic.permissionStatus.GRANTED ? "granted" : "denied"));

package/cordova.plugins.diagnostic.d.ts

@@ -1001,7 +1001,7 @@ interface Diagnostic {
      * @param errorCallback
      */
     presentLimitedLibraryPicker?: (
-        successCallback: (identifiers?: [string]) => void,
+        successCallback: (identifiers?: string[]) => void,
         errorCallback: (error: string) => void
     ) => void;
 
@@ -1149,7 +1149,7 @@ interface Diagnostic {
     requestBluetoothAuthorization?: (
         successCallback: () => void,
         errorCallback: (error: string) => void,
-        permissions?: ([string])
+        permissions?: (string[])
     ) => void;
 
     /**

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "7.1.2",
+    "version": "7.1.4",
     "name": "cordova.plugins.diagnostic",
     "cordova_name": "Diagnostic",
     "description": "Cordova/Phonegap plugin to check the state of Location/WiFi/Camera/Bluetooth device settings.",

package/plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova.plugins.diagnostic"
-    version="7.1.2">
+    version="7.1.4">
 
     <name>Diagnostic</name>
     <description>Cordova/Phonegap plugin to check the state of Location/WiFi/Camera/Bluetooth device settings.</description>

package/src/android/Diagnostic.java

@@ -143,6 +143,55 @@ public class Diagnostic extends CordovaPlugin{
         permissionsMap = Collections.unmodifiableMap(_permissionsMap);
     }
 
+    /**
+     * Map of minimum build SDK version supported by defined permissions
+     */
+    protected static final Map<String, Integer> minSdkPermissionMap;
+    static {
+        Map<String, Integer> _permissionsMap = new HashMap <String, Integer>();
+
+        // API 26+
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "ANSWER_PHONE_CALLS", 26);
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "READ_PHONE_NUMBERS", 26);
+
+        // API 28+
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "ACCEPT_HANDOVER", 28);
+
+        // API 29+
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "ACCESS_BACKGROUND_LOCATION", 29);
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "ACCESS_MEDIA_LOCATION", 29);
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "ACTIVITY_RECOGNITION", 29);
+
+        // API 31+
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "BLUETOOTH_ADVERTISE", 31);
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "BLUETOOTH_CONNECT",   31);
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "BLUETOOTH_SCAN",    31);
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "UWB_RANGING",      31);
+
+        // API 33+
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "BODY_SENSORS_BACKGROUND", 33);
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "NEARBY_WIFI_DEVICES", 33);
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "POST_NOTIFICATIONS", 33);
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "READ_MEDIA_AUDIO", 33);
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "READ_MEDIA_IMAGES", 33);
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "READ_MEDIA_VIDEO", 33);
+
+        minSdkPermissionMap = Collections.unmodifiableMap(_permissionsMap);
+    }
+
+    /**
+     * Map of maximum build SDK version supported by defined permissions
+     */
+    protected static final Map<String, Integer> maxSdkPermissionMap;
+    static {
+        Map<String, Integer> _permissionsMap = new HashMap <String, Integer>();
+
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "READ_EXTERNAL_STORAGE", 32);
+        Diagnostic.addBiDirMapEntry(_permissionsMap, "WRITE_EXTERNAL_STORAGE", 29);
+
+        maxSdkPermissionMap = Collections.unmodifiableMap(_permissionsMap);
+    }
+
 
     /*
      * Map of permission request code to callback context
@@ -553,18 +602,10 @@ public class Diagnostic extends CordovaPlugin{
             if(!permissionsMap.containsKey(permission)){
                 throw new Exception("Permission name '"+permission+"' is not a valid permission");
             }
-            if(Build.VERSION.SDK_INT < 29 && permission.equals("ACCESS_BACKGROUND_LOCATION")){
-                // This version of Android doesn't support background location permission so check for standard coarse location permission
-                permission = "ACCESS_COARSE_LOCATION";
-            }
-            if(Build.VERSION.SDK_INT < 29 && permission.equals("ACTIVITY_RECOGNITION")){
-                // This version of Android doesn't support activity recognition permission so check for body sensors permission
-                permission = "BODY_SENSORS";
-            }
             String androidPermission = permissionsMap.get(permission);
             Log.v(TAG, "Get authorisation status for "+androidPermission);
             boolean granted = hasRuntimePermission(androidPermission);
-            if(granted){
+            if(granted || isPermissionImplicitlyGranted(permission)){
                 statuses.put(permission, Diagnostic.STATUS_GRANTED);
             }else{
                 boolean showRationale = shouldShowRequestPermissionRationale(this.cordova.getActivity(), androidPermission);
@@ -587,13 +628,27 @@ public class Diagnostic extends CordovaPlugin{
         JSONArray permissionsToRequest = new JSONArray();
         for(int i = 0; i<currentPermissionsStatuses.names().length(); i++){
             String permission = currentPermissionsStatuses.names().getString(i);
+
+            if(!permissionsMap.containsKey(permission)){
+                throw new Exception("Permission name '"+permission+"' is not a supported permission");
+            }
+
             boolean granted = currentPermissionsStatuses.getString(permission) == Diagnostic.STATUS_GRANTED;
-            if(granted){
+            if(granted || isPermissionImplicitlyGranted(permission)){
                 Log.d(TAG, "Permission already granted for "+permission);
                 JSONObject requestStatuses = permissionStatuses.get(String.valueOf(requestId));
                 requestStatuses.put(permission, Diagnostic.STATUS_GRANTED);
                 permissionStatuses.put(String.valueOf(requestId), requestStatuses);
             }else{
+
+                if(minSdkPermissionMap.containsKey(permission) && getDeviceRuntimeSdkVersion() < minSdkPermissionMap.get(permission)){
+                    throw new Exception("Permission "+permission+" not supported for build SDK version "+getDeviceRuntimeSdkVersion());
+                }
+
+                if(maxSdkPermissionMap.containsKey(permission) && getDeviceRuntimeSdkVersion() > maxSdkPermissionMap.get(permission)){
+                    throw new Exception("Permission "+permission+" not supported for build SDK version "+getDeviceRuntimeSdkVersion());
+                }
+
                 String androidPermission = permissionsMap.get(permission);
                 Log.d(TAG, "Requesting permission for "+androidPermission);
                 permissionsToRequest.put(androidPermission);
@@ -609,6 +664,22 @@ public class Diagnostic extends CordovaPlugin{
         }
     }
 
+    protected boolean isPermissionImplicitlyGranted(String permission) throws Exception{
+        boolean isImplicitlyGranted = false;
+        int buildTargetSdkVersion = getBuildTargetSdkVersion();
+        int deviceRuntimeSdkVersion = getDeviceRuntimeSdkVersion();
+
+        if(minSdkPermissionMap.containsKey(permission)){
+            int minSDKForPermission = minSdkPermissionMap.get(permission);
+            if(buildTargetSdkVersion >= minSDKForPermission && deviceRuntimeSdkVersion < minSDKForPermission) {
+                isImplicitlyGranted = true;
+                Log.v(TAG, "Permission "+permission+" is implicitly granted because while it's defined in build SDK version "+buildTargetSdkVersion+", the device runtime SDK version "+deviceRuntimeSdkVersion+" does not support it.");
+            }
+        }
+
+        return isImplicitlyGranted;
+    }
+
     protected void sendRuntimeRequestResult(int requestId){
         String sRequestId = String.valueOf(requestId);
         CallbackContext context = callbackContexts.get(sRequestId);
@@ -863,31 +934,51 @@ public class Diagnostic extends CordovaPlugin{
     public JSONObject getDeviceOSVersion() throws Exception{
         JSONObject details = new JSONObject();
         details.put("version", Build.VERSION.RELEASE);
-        details.put("apiLevel", Build.VERSION.SDK_INT);
-        details.put("apiName", getNameForApiLevel(Build.VERSION.SDK_INT));
+        int buildVersion = getDeviceRuntimeSdkVersion();
+        details.put("apiLevel", buildVersion);
+        details.put("apiName", getNameForApiLevel(buildVersion));
         return details;
     }
 
+    protected int getDeviceRuntimeSdkVersion() {
+        return Build.VERSION.SDK_INT;
+    }
+
     public JSONObject getBuildOSVersion() throws Exception{
         JSONObject details = new JSONObject();
+        int targetVersion = getBuildTargetSdkVersion();
+        int minVersion = getBuildMinimumSdkVersion();
+
+        details.put("targetApiLevel", targetVersion);
+        details.put("targetApiName", getNameForApiLevel(targetVersion));
+        details.put("minApiLevel", minVersion);
+        details.put("minApiName", getNameForApiLevel(minVersion));
+        return details;
+    }
+
+    protected int getBuildTargetSdkVersion() throws Exception{
         int targetVersion = 0;
-        int minVersion = 0;
         Activity activity = instance.cordova.getActivity();
         ApplicationInfo applicationInfo = activity.getPackageManager().getApplicationInfo(activity.getPackageName(), 0);
         if (applicationInfo != null) {
             targetVersion = applicationInfo.targetSdkVersion;
+        }
+        return targetVersion;
+    }
+
+    protected int getBuildMinimumSdkVersion() throws Exception{
+        int minVersion = 0;
+        Activity activity = instance.cordova.getActivity();
+        ApplicationInfo applicationInfo = activity.getPackageManager().getApplicationInfo(activity.getPackageName(), 0);
+        if (applicationInfo != null) {
             if(Build.VERSION.SDK_INT >= 24){
                 minVersion = applicationInfo.minSdkVersion;
             }
         }
-
-        details.put("targetApiLevel", targetVersion);
-        details.put("targetApiName", getNameForApiLevel(targetVersion));
-        details.put("minApiLevel", minVersion);
-        details.put("minApiName", getNameForApiLevel(minVersion));
-        return details;
+        return minVersion;
     }
 
+
     // https://stackoverflow.com/a/55946200/777265
     protected String getNameForApiLevel(int apiLevel) throws Exception{
         Field[] fields = Build.VERSION_CODES.class.getFields();

package/src/android/Diagnostic_Bluetooth.java

@@ -244,6 +244,10 @@ public class Diagnostic_Bluetooth extends CordovaPlugin {
             callbackContext.error("Cannot change Bluetooth state as device does not support Bluetooth");
             return;
         }
+        if(Build.VERSION.SDK_INT >= 33){ // TIRAMISU / Android 13
+            callbackContext.error("Cannot change Bluetooth state on Android 13+ as this is no longer supported");
+            return;
+        }
 
         BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
         boolean isEnabled = bluetoothAdapter.isEnabled();
@@ -252,9 +256,11 @@ public class Diagnostic_Bluetooth extends CordovaPlugin {
 
         if (statuses.getString("BLUETOOTH_CONNECT").equals(Diagnostic.STATUS_GRANTED)) {
             if (enable && !isEnabled) {
+                https://developer.android.com/reference/android/bluetooth/BluetoothAdapter#enable()
                 bluetoothAdapter.enable();
             }
             else if(!enable && isEnabled) {
+                https://developer.android.com/reference/android/bluetooth/BluetoothAdapter#disable()
                 bluetoothAdapter.disable();
             }
             callbackContext.success();

package/src/android/Diagnostic_Camera.java

@@ -149,24 +149,24 @@ public class Diagnostic_Camera extends CordovaPlugin{
      * Internals
      ***********/
 
-    private String[] getPermissions(boolean externalStorage){
+    private String[] getPermissions(boolean storage){
         String[] permissions = {cameraPermission};
-        if(externalStorage){
+        if(storage){
             permissions = Diagnostic.instance.concatStrings(permissions, storagePermissions);
         }
         return permissions;
     }
 
     private void requestCameraAuthorization(JSONArray args, CallbackContext callbackContext) throws Exception{
-        boolean externalStorage = args.getBoolean(0);
-        String[] permissions = getPermissions(externalStorage);
+        boolean storage = args.getBoolean(0);
+        String[] permissions = getPermissions(storage);
         int requestId = Diagnostic.instance.storeContextByRequestId(callbackContext);
         Diagnostic.instance._requestRuntimePermissions(Diagnostic.instance.stringArrayToJsonArray(permissions), requestId);
     }
 
     private void getCameraAuthorizationStatus(JSONArray args, CallbackContext callbackContext) throws Exception{
-        boolean externalStorage = args.getBoolean(0);
-        String[] permissions = getPermissions(externalStorage);
+        boolean storage = args.getBoolean(0);
+        String[] permissions = getPermissions(storage);
         JSONObject statuses = Diagnostic.instance._getPermissionsAuthorizationStatus(permissions);
         callbackContext.success(statuses);
     }

package/src/android/Diagnostic_External_Storage.java

@@ -136,11 +136,15 @@ public class Diagnostic_External_Storage extends CordovaPlugin{
      ***********/
 
     protected void getExternalSdCardDetails() throws Exception{
-        String permission = diagnostic.permissionsMap.get(externalStoragePermission);
-        if (diagnostic.hasRuntimePermission(permission)) {
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             _getExternalSdCardDetails();
         } else {
-            diagnostic.requestRuntimePermission(permission, Diagnostic.GET_EXTERNAL_SD_CARD_DETAILS_PERMISSION_REQUEST);
+            String permission = diagnostic.permissionsMap.get(externalStoragePermission);
+            if (diagnostic.hasRuntimePermission(permission)) {
+                _getExternalSdCardDetails();
+            } else {
+                diagnostic.requestRuntimePermission(permission, Diagnostic.GET_EXTERNAL_SD_CARD_DETAILS_PERMISSION_REQUEST);
+            }
         }
     }
 

package/www/android/diagnostic.camera.js

@@ -28,23 +28,6 @@ var Diagnostic_Camera = (function(){
      *
      ********************/
 
-    function combineCameraStatuses(statuses){
-        var cameraStatus = statuses[Diagnostic.permission.CAMERA],
-            storageStatus = statuses[Diagnostic.permission.READ_EXTERNAL_STORAGE] || statuses[Diagnostic.permission.READ_MEDIA_IMAGES],
-            status;
-
-        if(cameraStatus === Diagnostic.permissionStatus.DENIED_ALWAYS || storageStatus === Diagnostic.permissionStatus.DENIED_ALWAYS){
-            status = Diagnostic.permissionStatus.DENIED_ALWAYS;
-        }else if(cameraStatus === Diagnostic.permissionStatus.DENIED_ONCE || storageStatus === Diagnostic.permissionStatus.DENIED_ONCE){
-            status = Diagnostic.permissionStatus.DENIED_ONCE;
-        }else if(cameraStatus === Diagnostic.permissionStatus.NOT_REQUESTED || storageStatus === Diagnostic.permissionStatus.NOT_REQUESTED){
-            status = Diagnostic.permissionStatus.NOT_REQUESTED;
-        }else{
-            status = Diagnostic.permissionStatus.GRANTED;
-        }
-        return status;
-    }
-
     function mapFromLegacyCameraApi() {
         var params;
         if (typeof arguments[0]  === "function") {
@@ -54,11 +37,12 @@ var Diagnostic_Camera = (function(){
                 params.errorCallback = arguments[1];
             }
             if(arguments.length > 2 && arguments[2]  === false) {
-                params.externalStorage = arguments[2];
+                params.storage = arguments[2];
             }
         }else { // if (typeof arguments[0]  === "object")
             params = arguments[0];
         }
+        if(typeof params.storage === 'undefined') params.storage = true; // default to true
         return params;
     }
 
@@ -91,8 +75,10 @@ var Diagnostic_Camera = (function(){
      * This callback function is passed a single boolean parameter which is TRUE if camera is present and authorized for use.
      *  - {Function} errorCallback -  The callback which will be called when the operation encounters an error.
      *  This callback function is passed a single string parameter containing the error message.
-     *  - {Boolean} externalStorage - (Android only) If true, checks permission for READ_EXTERNAL_STORAGE in addition to CAMERA run-time permission.
-     *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.
+     * - {Boolean} storage - (Android only) If true, requests storage permissions in addition to CAMERA run-time permission.
+     *  On Android 13+, storage permissions are READ_MEDIA_IMAGES and READ_MEDIA_VIDEO. On Android 9-12, storage permission is READ_EXTERNAL_STORAGE.
+     *  cordova-plugin-camera requires both storage and camera permissions.
+     *  Defaults to true.
      */
     Diagnostic_Camera.isCameraAvailable = function(params) {
         params = mapFromLegacyCameraApi.apply(this, arguments);
@@ -130,7 +116,9 @@ var Diagnostic_Camera = (function(){
      *  - {Function} successCallback - function to call on successful request for runtime permissions.
      * This callback function is passed a single string parameter which defines the resulting authorisation status as a value in cordova.plugins.diagnostic.permissionStatus.
      *  - {Function} errorCallback - function to call on failure to request authorisation.
-     *  - {Boolean} externalStorage - (Android only) If true, requests storage permissions for in addition to CAMERA run-time permission.
+     * - {Boolean} storage - (Android only) If true, requests storage permissions in addition to CAMERA run-time permission.
+     *  On Android 13+, storage permissions are READ_MEDIA_IMAGES and READ_MEDIA_VIDEO. On Android 9-12, storage permission is READ_EXTERNAL_STORAGE.
+     *  cordova-plugin-camera requires both storage and camera permissions.
      *  Defaults to true.
      */
     Diagnostic_Camera.requestCameraAuthorization = function(params){
@@ -138,39 +126,41 @@ var Diagnostic_Camera = (function(){
 
         params.successCallback = params.successCallback || function(){};
         var onSuccess = function(statuses){
-            params.successCallback(numberOfKeys(statuses) > 1 ? combineCameraStatuses(statuses): statuses[Diagnostic.permission.CAMERA]);
+            params.successCallback(numberOfKeys(statuses) > 1 ? cordova.plugins.diagnostic._combinePermissionStatuses(statuses): statuses[Diagnostic.permission.CAMERA]);
         };
 
         return cordova.exec(onSuccess,
             params.errorCallback,
             'Diagnostic_Camera',
             'requestCameraAuthorization',
-            [!!params.externalStorage]);
+            [!!params.storage]);
     };
 
     /**
      * Returns the authorisation status for runtime permissions to use the camera.
      * Note: this is intended for Android 6 / API 23 and above. Calling on Android 5 / API 22 and below will always return GRANTED status as permissions are already granted at installation time.
      * @param {Object} params - (optional) parameters:
-     *  - {Function} successCallback - function to call on successful request for runtime permissions status.
+     *  - {Function} successCallback - function to call on successful request for runtime permission status.
      * This callback function is passed a single string parameter which defines the current authorisation status as a value in cordova.plugins.diagnostic.permissionStatus.
      *  - {Function} errorCallback - function to call on failure to request authorisation status.
-     *  - {Boolean} externalStorage - (Android only) If true, checks permission for READ_EXTERNAL_STORAGE in addition to CAMERA run-time permission.
-     *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.
+     * - {Boolean} storage - (Android only) If true, requests storage permissions in addition to CAMERA run-time permission.
+     *  On Android 13+, storage permissions are READ_MEDIA_IMAGES and READ_MEDIA_VIDEO. On Android 9-12, storage permission is READ_EXTERNAL_STORAGE.
+     *  cordova-plugin-camera requires both storage and camera permissions.
+     *  Defaults to true.
      */
     Diagnostic_Camera.getCameraAuthorizationStatus = function(params){
         params = mapFromLegacyCameraApi.apply(this, arguments);
 
         params.successCallback = params.successCallback || function(){};
         var onSuccess = function(statuses){
-            params.successCallback(numberOfKeys(statuses) > 1 ? combineCameraStatuses(statuses): statuses[Diagnostic.permission.CAMERA]);
+            params.successCallback(numberOfKeys(statuses) > 1 ? cordova.plugins.diagnostic._combinePermissionStatuses(statuses): statuses[Diagnostic.permission.CAMERA]);
         };
 
         return cordova.exec(onSuccess,
             params.errorCallback,
             'Diagnostic_Camera',
             'getCameraAuthorizationStatus',
-            [!!params.externalStorage]);
+            [!!params.storage]);
     };
 
     /**
@@ -180,8 +170,10 @@ var Diagnostic_Camera = (function(){
      *  - {Function} successCallback - function to call on successful request for runtime permissions status.
      * This callback function is passed a single boolean parameter which is TRUE if the app currently has runtime authorisation to use location.
      *  - {Function} errorCallback - function to call on failure to request authorisation status.
-     *  - {Boolean} externalStorage - (Android only) If true, checks permission for READ_EXTERNAL_STORAGE in addition to CAMERA run-time permission.
-     *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.
+     * - {Boolean} storage - (Android only) If true, requests storage permissions in addition to CAMERA run-time permission.
+     *  On Android 13+, storage permissions are READ_MEDIA_IMAGES and READ_MEDIA_VIDEO. On Android 9-12, storage permission is READ_EXTERNAL_STORAGE.
+     *  cordova-plugin-camera requires both storage and camera permissions.
+     *  Defaults to true.
      */
     Diagnostic_Camera.isCameraAuthorized = function(params){
         params = mapFromLegacyCameraApi.apply(this, arguments);
@@ -194,7 +186,7 @@ var Diagnostic_Camera = (function(){
         Diagnostic_Camera.getCameraAuthorizationStatus({
             successCallback: onSuccess,
             errorCallback: params.errorCallback,
-            externalStorage: params.externalStorage
+            storage: params.storage
         });
     };
 

package/www/android/diagnostic.js

@@ -111,12 +111,35 @@ var Diagnostic = (function(){
     Diagnostic._onNFCStateChange =
         Diagnostic._onPermissionRequestComplete = function(){};
 
+    Diagnostic._combinePermissionStatuses = function(statuses){
+        var status = Diagnostic.permissionStatus.NOT_REQUESTED;
+        if(anyStatusIs(statuses, Diagnostic.permissionStatus.DENIED_ALWAYS)){
+            status = Diagnostic.permissionStatus.DENIED_ALWAYS;
+        }else if(anyStatusIs(statuses, Diagnostic.permissionStatus.DENIED_ONCE)){
+            status = Diagnostic.permissionStatus.DENIED_ONCE;
+        }else if(anyStatusIs(statuses, Diagnostic.permissionStatus.GRANTED)){
+            status = Diagnostic.permissionStatus.GRANTED;
+        }
+        return status;
+    };
+
     /********************
      *
      * Internal functions
      *
      ********************/
 
+    function anyStatusIs(statuses, status){
+        var anyStatus = false;
+        for(var permission in statuses){
+            if(statuses[permission] === status){
+                anyStatus = true;
+                break;
+            }
+        }
+        return anyStatus;
+    }
+
     function checkForInvalidPermissions(permissions, errorCallback){
         if(typeof(permissions) !== "object") permissions = [permissions];
         var valid = true, invalidPermissions = [];

package/www/android/diagnostic.location.js

@@ -49,20 +49,13 @@ var Diagnostic_Location = (function(){
     function combineLocationStatuses(statuses){
         var coarseStatus = statuses[Diagnostic.permission.ACCESS_COARSE_LOCATION],
             fineStatus = statuses[Diagnostic.permission.ACCESS_FINE_LOCATION],
-            backgroundStatus = typeof statuses[Diagnostic.permission.ACCESS_BACKGROUND_LOCATION] !== "undefined" ? statuses[Diagnostic.permission.ACCESS_BACKGROUND_LOCATION] : true
-            status;
+            backgroundStatus = typeof statuses[Diagnostic.permission.ACCESS_BACKGROUND_LOCATION] !== "undefined" ? statuses[Diagnostic.permission.ACCESS_BACKGROUND_LOCATION] : true;
 
-        var GRANTED = backgroundStatus === Diagnostic.permissionStatus.GRANTED ? Diagnostic.permissionStatus.GRANTED : Diagnostic.permissionStatus.GRANTED_WHEN_IN_USE;
-
-        if(coarseStatus === Diagnostic.permissionStatus.GRANTED || fineStatus === Diagnostic.permissionStatus.GRANTED){
-            status = GRANTED;
-        }else if(coarseStatus === Diagnostic.permissionStatus.DENIED_ONCE || fineStatus === Diagnostic.permissionStatus.DENIED_ONCE){
-            status = Diagnostic.permissionStatus.DENIED_ONCE;
-        }else if(coarseStatus === Diagnostic.permissionStatus.DENIED_ALWAYS || fineStatus === Diagnostic.permissionStatus.DENIED_ALWAYS){
-            status = Diagnostic.permissionStatus.DENIED_ALWAYS;
-        }else if(coarseStatus === Diagnostic.permissionStatus.NOT_REQUESTED || fineStatus === Diagnostic.permissionStatus.NOT_REQUESTED){
-            status = Diagnostic.permissionStatus.NOT_REQUESTED;
+        var status = cordova.plugins.diagnostic._combinePermissionStatuses([coarseStatus, fineStatus]);
+        if(status === Diagnostic.permissionStatus.GRANTED && backgroundStatus !== Diagnostic.permissionStatus.GRANTED){
+            status = Diagnostic.permissionStatus.GRANTED_WHEN_IN_USE;
         }
+
         return status;
     }