From 1138ed5f89034ff52676ab83560a6b0652a3879a Mon Sep 17 00:00:00 2001
From: jmillman <jmillman@basistech.com>
Date: Thu, 2 Jul 2015 10:34:14 -0400
Subject: [PATCH] fix video/supoprted mimetype  confusion

---
 .../autopsy/imagegallery/FileTypeUtils.java        | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/FileTypeUtils.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/FileTypeUtils.java
index 3955f8f4b0..c04bbd570a 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/FileTypeUtils.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/FileTypeUtils.java
@@ -44,6 +44,7 @@ public enum FileTypeUtils {
     instance;
 
     private static final Set<String> supportedMimeTypes = new HashSet<>();
+    private static final Set<String> videoMimeTypes = new HashSet<>();
 
     public static Set<String> getAllSupportedMimeTypes() {
         return Collections.unmodifiableSet(supportedMimeTypes);
@@ -65,11 +66,13 @@ public enum FileTypeUtils {
 
         supportedExtensions = Sets.union(imageExtensions, videoExtensions);
 
+        videoMimeTypes.addAll(Arrays.asList("application/x-shockwave-flash"));
+
+        supportedMimeTypes.addAll(videoMimeTypes);
         supportedMimeTypes.addAll(Stream.of(ImageIO.getReaderMIMETypes())
                 .map(String::toLowerCase)
                 .collect(Collectors.toList()));
 
-        supportedMimeTypes.addAll(Arrays.asList("application/x-shockwave-flash"));
     }
 
     private static FileTypeDetector FILE_TYPE_DETECTOR;
@@ -108,7 +111,7 @@ public enum FileTypeUtils {
     }
 
     /**
-     *
+     * does the given file have drawable/supported mime type
      *
      * @param file
      *
@@ -137,7 +140,10 @@ public enum FileTypeUtils {
         return Optional.empty();
     }
 
-    /** @param file
+    /**
+     * is the given file a video
+     *
+     * @param file
      *
      * @return true if the given file has a video mime type (video/*,
      *         application/x-shockwave-flash, etc) or, if no mimetype is
@@ -150,7 +156,7 @@ public enum FileTypeUtils {
                 String mimeType = fileTypeDetector.getFileType(file);
                 if (nonNull(mimeType)) {
                     mimeType = mimeType.toLowerCase();
-                    return mimeType.startsWith("video/") || supportedMimeTypes.contains(mimeType);
+                    return mimeType.startsWith("video/") || videoMimeTypes.contains(mimeType);
                 }
             }
         } catch (TskCoreException ex) {