From 06853445ea5a99891cad20758b1457c6d20720e6 Mon Sep 17 00:00:00 2001
From: Hovhannes Menejyan <menejyan.hovhannes@gmail.com>
Date: Fri, 4 Nov 2022 14:59:28 -0700
Subject: [PATCH] Android crash fix

---
 .../java/com/ReactNativeBlobUtil/ReactNativeBlobUtilReq.java  | 4 ++--
 .../src/main/java/com/ReactNativeBlobUtil/Utils/MimeType.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilReq.java b/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilReq.java
index 1002d3497..af42b836c 100644
--- a/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilReq.java
+++ b/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilReq.java
@@ -297,7 +297,7 @@ public void run() {
 
         // find cached result if `key` property exists
         String cacheKey = this.taskId;
-        String ext = this.options.appendExt.isEmpty() ? "" : "." + this.options.appendExt;
+        String ext = (this.options.appendExt == null || this.options.appendExt.isEmpty()) ? "" : "." + this.options.appendExt;
 
         if (this.options.key != null) {
             cacheKey = ReactNativeBlobUtilUtils.getMD5(this.options.key);
@@ -402,7 +402,7 @@ else if (value.equalsIgnoreCase("utf8"))
 
                 if (rawRequestBodyArray != null) {
                     requestType = RequestType.Form;
-                } else if (cType.isEmpty()) {
+                } else if (cType == null || cType.isEmpty()) {
                     if (!cType.equalsIgnoreCase("")) {
                         builder.header("Content-Type", "application/octet-stream");
                     }
diff --git a/android/src/main/java/com/ReactNativeBlobUtil/Utils/MimeType.java b/android/src/main/java/com/ReactNativeBlobUtil/Utils/MimeType.java
index 5d71f75d8..aac0dfe25 100644
--- a/android/src/main/java/com/ReactNativeBlobUtil/Utils/MimeType.java
+++ b/android/src/main/java/com/ReactNativeBlobUtil/Utils/MimeType.java
@@ -27,7 +27,7 @@ public class MimeType {
     public static String getFullFileName(String name, String mimeType) {
         // Prior to API 29, MimeType.BINARY_FILE has no file extension
         String ext = MimeType.getExtensionFromMimeType(mimeType);
-        if (ext.isEmpty() || name.endsWith("." + "ext")) return name;
+        if ((ext == null || ext.isEmpty()) || name.endsWith("." + "ext")) return name;
         else {
             String fn = name + "." + ext;
             if (fn.endsWith(".")) return StringUtils.stripEnd(fn, ".");