Extract MimeUtils

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 608876199294cc0c610120898b28fbacca1d02ce..bad2efce3acad478967d3da7bd4e0755f3adf537 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -10,6 +10,7 @@ import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.util.MimeUtils;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -105,7 +106,7 @@ public class SyncHelper {
                 try (var groupsFileStream = new FileInputStream(groupsFile)) {
                     var attachmentStream = SignalServiceAttachment.newStreamBuilder()
                             .withStream(groupsFileStream)
-                            .withContentType("application/octet-stream")
+                            .withContentType(MimeUtils.OCTET_STREAM)
                             .withLength(groupsFile.length())
                             .build();
 
@@ -173,7 +174,7 @@ public class SyncHelper {
                 try (var contactsFileStream = new FileInputStream(contactsFile)) {
                     var attachmentStream = SignalServiceAttachment.newStreamBuilder()
                             .withStream(contactsFileStream)
-                            .withContentType("application/octet-stream")
+                            .withContentType(MimeUtils.OCTET_STREAM)
                             .withLength(contactsFile.length())
                             .build();
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java b/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java
index 04d4bbc8e9bc2077a92d994c75cf657caf506b7e..b848c8683392005f5e27f306eba21f7332d63a3a 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java
@@ -17,7 +17,6 @@ public record DataURI(String mediaType, Map<String, String> parameter, byte[] da
             Pattern.CASE_INSENSITIVE);
     public static final Pattern PARAMETER_PATTERN = Pattern.compile("\\G;(?<key>.+)=(?<value>.+)",
             Pattern.CASE_INSENSITIVE);
-    public static final String DEFAULT_TYPE = "text/plain";
 
     /**
      * Generates a new {@link DataURI} object that follows
@@ -32,7 +31,7 @@ public record DataURI(String mediaType, Map<String, String> parameter, byte[] da
      * The {@code <mediatype>} is an Internet media type specification (with
      * optional parameters.) The appearance of ";base64" means that the data
      * is encoded as base64. Without ";base64", the data is represented using (ASCII) URL Escaped encoding.
-     * If {@code <mediatype>} is omitted, it defaults to {@link DataURI#DEFAULT_TYPE}.
+     * If {@code <mediatype>} is omitted, it defaults to {@link MimeUtils#PLAIN_TEXT}.
      * Parameter values should use the URL Escaped encoding.
      *
      * @param dataURI the data URI
@@ -65,6 +64,6 @@ public record DataURI(String mediaType, Map<String, String> parameter, byte[] da
             data = URLDecoder.decode(matcher.group("data"), StandardCharsets.UTF_8).getBytes(StandardCharsets.UTF_8);
         }
 
-        return new DataURI(Optional.ofNullable(matcher.group("type")).orElse(DEFAULT_TYPE), parameters, data);
+        return new DataURI(Optional.ofNullable(matcher.group("type")).orElse(MimeUtils.PLAIN_TEXT), parameters, data);
     }
 }

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/MimeUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MimeUtils.java
new file mode 100644 (file)
index 0000000..17d8134
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/util/MimeUtils.java
@@ -0,0 +1,51 @@
+package org.asamk.signal.manager.util;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLConnection;
+import java.nio.file.Files;
+import java.util.Optional;
+
+public class MimeUtils {
+
+    public static final String LONG_TEXT = "text/x-signal-plain";
+    public static final String PLAIN_TEXT = "text/plain";
+    public static final String OCTET_STREAM = "application/octet-stream";
+
+    public static Optional<String> getFileMimeType(final File file) throws IOException {
+        var mime = Files.probeContentType(file.toPath());
+        if (mime != null) {
+            return Optional.of(mime);
+        }
+
+        try (final InputStream bufferedStream = new BufferedInputStream(new FileInputStream(file))) {
+            return getStreamMimeType(bufferedStream);
+        }
+    }
+
+    public static Optional<String> getStreamMimeType(final InputStream inputStream) throws IOException {
+        return Optional.ofNullable(URLConnection.guessContentTypeFromStream(inputStream));
+    }
+
+    public static Optional<String> guessExtensionFromMimeType(String mimeType) {
+        return Optional.ofNullable(switch (mimeType) {
+            case "application/vnd.android.package-archive" -> "apk";
+            case "application/json" -> "json";
+            case "image/png" -> "png";
+            case "image/jpeg" -> "jpg";
+            case "image/heic" -> "heic";
+            case "image/heif" -> "heif";
+            case "image/webp" -> "webp";
+            case "image/gif" -> "gif";
+            case "audio/aac" -> "aac";
+            case "video/mp4" -> "mp4";
+            case "text/x-vcard" -> "vcf";
+            case PLAIN_TEXT, LONG_TEXT -> "txt";
+            case OCTET_STREAM -> "bin";
+            default -> null;
+        });
+    }
+}

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
index f3825cc4aced54a096d98192f155dcc3957fd8cd..302535d9d6c2aca232d77e12ed66b97081fb2a27 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
@@ -12,7 +12,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Optional;
 import java.util.zip.ZipFile;
@@ -118,11 +117,11 @@ public class StickerUtils {
         if (zip != null) {
             final var entry = zip.getEntry(subfile);
             try (InputStream bufferedStream = new BufferedInputStream(zip.getInputStream(entry))) {
-                return URLConnection.guessContentTypeFromStream(bufferedStream);
+                return MimeUtils.getStreamMimeType(bufferedStream).orElse(null);
             }
         } else {
             final var file = new File(rootPath, subfile);
-            return Utils.getFileMimeType(file, null);
+            return MimeUtils.getFileMimeType(file).orElse(null);
         }
     }
 }

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index c50988a1f2801bcb6f4767a72521f11f9994d610..4be7c39a102965aa4513e1e553a6ea5b24a3e9db 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -9,16 +9,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 
-import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URLConnection;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -34,19 +31,6 @@ public class Utils {
 
     private final static Logger logger = LoggerFactory.getLogger(Utils.class);
 
-    public static String getFileMimeType(final File file, final String defaultMimeType) throws IOException {
-        var mime = Files.probeContentType(file.toPath());
-        if (mime == null) {
-            try (final InputStream bufferedStream = new BufferedInputStream(new FileInputStream(file))) {
-                mime = URLConnection.guessContentTypeFromStream(bufferedStream);
-            }
-        }
-        if (mime == null) {
-            return defaultMimeType;
-        }
-        return mime;
-    }
-
     public static Pair<StreamDetails, Optional<String>> createStreamDetailsFromDataURI(final String dataURI) {
         final DataURI uri = DataURI.of(dataURI);
 
@@ -57,7 +41,7 @@ public class Utils {
     public static StreamDetails createStreamDetailsFromFile(final File file) throws IOException {
         final InputStream stream = new FileInputStream(file);
         final var size = file.length();
-        final var mime = getFileMimeType(file, "application/octet-stream");
+        final var mime = MimeUtils.getFileMimeType(file).orElse(MimeUtils.OCTET_STREAM);
         return new StreamDetails(stream, mime, size);
     }