Convert gradle scripts to kotlin

[signal-cli] / src / main / java / org / asamk / signal / manager / util / Utils.java

diff --git a/src/main/java/org/asamk/signal/manager/util/Utils.java b/src/main/java/org/asamk/signal/manager/util/Utils.java
index e68b5ce3660fdea86a24717462fce96db017f811..fb38d01a58212b9dc716179c5ea05039bfbe6cb1 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -36,10 +36,7 @@ public class Utils {
     public static StreamDetails createStreamDetailsFromFile(File file) throws IOException {
         InputStream stream = new FileInputStream(file);
         final long size = file.length();
-        String mime = Files.probeContentType(file.toPath());
-        if (mime == null) {
-            mime = "application/octet-stream";
-        }
+        final String mime = getFileMimeType(file, "application/octet-stream");
         return new StreamDetails(stream, mime, size);
     }
 
@@ -87,7 +84,7 @@ public class Utils {
 
     public static JsonNode getNotNullNode(JsonNode parent, String name) throws InvalidObjectException {
         JsonNode node = parent.get(name);
-        if (node == null) {
+        if (node == null || node.isNull()) {
             throw new InvalidObjectException(String.format("Incorrect file format: expected parameter %s not found ",
                     name));
         }