Support ambigous file extension mimetypes.

Previously, CMFileManager operated under the assumption that file
extensions map to exactly one mimetype. This is not true in some cases,
such as .3gp files, which can have an audio or video mimetype.

Add support so that in mime_types.properties we can specify a comma
separated list of mimetype info that are matched with a given extension.
If an AmbiguousExtensionHelper subclass implementation is provided for one of these
extensions, this is used to determine the correct mimetype for the file.

Change-Id: Ie73d6ad646692dfeac112ac50c1c6436e6b5559b

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/cyanogenmod/filemanager/commands/java/FolderUsageCommand.java b/src/com/cyanogenmod/filemanager/commands/java/FolderUsageCommand.java
index c201dfb..d15c5dc 100644
--- a/src/com/cyanogenmod/filemanager/commands/java/FolderUsageCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/FolderUsageCommand.java
@@ -24,6 +24,7 @@ import com.cyanogenmod.filemanager.console.ExecutionException;
 import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
 import com.cyanogenmod.filemanager.model.FolderUsage;
+import com.cyanogenmod.filemanager.util.FileHelper;
 import com.cyanogenmod.filemanager.util.MimeTypeHelper;
 import com.cyanogenmod.filemanager.util.MimeTypeHelper.MimeTypeCategory;
 
@@ -149,8 +150,12 @@ public class FolderUsageCommand extends Program implements FolderUsageExecutable
                     } else {
                         this.mFolderUsage.addFile();
                         // Compute statistics and size
+                        File file = files[i];
+                        String ext = FileHelper.getExtension(file.getName());
                         MimeTypeCategory category =
-                                MimeTypeHelper.getCategory(null, files[i]);
+                                MimeTypeHelper.getCategoryFromExt(null,
+                                                                  ext,
+                                                                  file.getAbsolutePath());
                         this.mFolderUsage.addFileToCategory(category);
                         this.mFolderUsage.addSize(files[i].length());
                     }