From 64241f523802faeac0dd6fe944f93e533ddc6511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Grillo?= <andregrillo@gmail.com>
Date: Fri, 19 Feb 2021 13:23:38 +0000
Subject: [PATCH] Android9 crash Fix - null file name error

---
 package.json                    | 2 +-
 plugin.xml                      | 2 +-
 src/android/CameraLauncher.java | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 38fe5bc3d..2318beb2f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-camera",
-  "version": "4.2.0-OS",
+  "version": "4.2.0-OS4",
   "description": "Cordova Camera Plugin",
   "types": "./types/index.d.ts",
   "cordova": {
diff --git a/plugin.xml b/plugin.xml
index cb0e2fbfc..827377cb2 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -21,7 +21,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-plugin-camera"
-    version="4.2.0-OS3">
+    version="4.2.0-OS4">
     <name>Camera</name>
     <description>Cordova Camera Plugin</description>
     <license>Apache 2.0</license>
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index 0c2424861..e578cee7f 100644
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -92,6 +92,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
     private static final String GET_All = "Get All";
     private static final String CROPPED_URI_KEY = "croppedUri";
     private static final String IMAGE_URI_KEY = "imageUri";
+    private static final String IMAGE_FILE_PATH_KEY = "imageFilePath";
 
     private static final String TAKE_PICTURE_ACTION = "takePicture";
 
@@ -1368,6 +1369,10 @@ public Bundle onSaveInstanceState() {
             state.putString(IMAGE_URI_KEY, this.imageFilePath);
         }
 
+        if (this.imageFilePath != null) {
+            state.putString(IMAGE_FILE_PATH_KEY, this.imageFilePath);
+        }
+
         return state;
     }
 
@@ -1393,6 +1398,10 @@ public void onRestoreStateForActivityResult(Bundle state, CallbackContext callba
             this.imageUri = Uri.parse(state.getString(IMAGE_URI_KEY));
         }
 
+        if (state.containsKey(IMAGE_FILE_PATH_KEY)) {
+           this.imageFilePath = state.getString(IMAGE_FILE_PATH_KEY);
+        }
+
         this.callbackContext = callbackContext;
     }
 }