pull master

spoonconsulting · Jul 5, 2024 · 93621d2 · 93621d2
2 parents 3200471 + 20fe4ba
commit 93621d2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [2.0.20](https://github.com/spoonconsulting/cordova-plugin-simple-camera-preview/compare/v2.0.19...v2.0.20) (2024-07-05)
+* **Android:** Null check
+
 ## [2.0.19](https://github.com/spoonconsulting/cordova-plugin-simple-camera-preview/compare/v2.0.18...v2.0.19) (2024-06-17)
 
 * **iOS:** Release unused memory after capture

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spoonconsulting/cordova-plugin-simple-camera-preview",
-  "version": "2.0.19",
+  "version": "2.0.20",
   "description": "Cordova plugin that allows camera interaction from HTML code for showing camera preview below or on top of the HTML.",
   "keywords": [
     "cordova",

diff --git a/plugin.xml b/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<plugin id="@spoonconsulting/cordova-plugin-simple-camera-preview" version="2.0.19" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="@spoonconsulting/cordova-plugin-simple-camera-preview" version="2.0.20" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
 
   <name>cordova-plugin-simple-camera-preview</name>
   <description>Cordova plugin that allows camera interaction from HTML code. Show camera preview popup on top of the HTML.</description>

diff --git a/src/android/CameraPreviewFragment.java b/src/android/CameraPreviewFragment.java
@@ -361,7 +361,7 @@ public void switchCameraTo(String device, CameraSwitchedCallback cameraSwitchedC
     @SuppressLint("RestrictedApi")
     public void setUpCamera(String captureDevice, ProcessCameraProvider cameraProvider) {
         CameraSelector cameraSelector;
-        if (captureDevice.equals("ultra-wide-angle")) {
+        if (captureDevice != null && captureDevice.equals("ultra-wide-angle")) {
             cameraSelector = new CameraSelector.Builder()
                     .addCameraFilter(cameraInfos -> {
                         List<Camera2CameraInfoImpl> backCameras = new ArrayList<>();