diff --git a/res/raw/mime_types.properties b/res/raw/mime_types.properties index a9a8229f4..db2d295e3 100644 --- a/res/raw/mime_types.properties +++ b/res/raw/mime_types.properties @@ -18,7 +18,7 @@ # Mime type list # # Format: -# = | | +# (extension) = (category) | (mime type) | (drawable) # # Binary diff --git a/src/com/cyanogenmod/filemanager/commands/shell/UncompressCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/UncompressCommand.java index a4d277f9a..0bade8aca 100644 --- a/src/com/cyanogenmod/filemanager/commands/shell/UncompressCommand.java +++ b/src/com/cyanogenmod/filemanager/commands/shell/UncompressCommand.java @@ -342,7 +342,7 @@ private static Mode getMode(String src) { int cc = modes.length; for (int i = 0; i < cc; i++) { Mode mode = modes[i]; - if (mode.mMode.mExtension.compareTo(extension) == 0) { + if (mode.mMode.mExtension.compareToIgnoreCase(extension) == 0) { return mode; } } diff --git a/src/com/cyanogenmod/filemanager/ui/policy/CompressActionPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/CompressActionPolicy.java index 6c98f02d8..bdefe1986 100644 --- a/src/com/cyanogenmod/filemanager/ui/policy/CompressActionPolicy.java +++ b/src/com/cyanogenmod/filemanager/ui/policy/CompressActionPolicy.java @@ -743,7 +743,7 @@ static void checkZipSecurityWarning( // the system and is need a security alert that the user can confirm prior to // make the extraction String ext = FileHelper.getExtension(fso); - if (ConsoleBuilder.isPrivileged() && ext.compareTo("zip") == 0) { //$NON-NLS-1$ + if (ConsoleBuilder.isPrivileged() && ext.compareToIgnoreCase("zip") == 0) { //$NON-NLS-1$ AlertDialog dialog = DialogHelper.createYesNoDialog( ctx, R.string.confirm_overwrite, diff --git a/src/com/cyanogenmod/filemanager/util/FileHelper.java b/src/com/cyanogenmod/filemanager/util/FileHelper.java index f4f3612eb..abf4fed04 100644 --- a/src/com/cyanogenmod/filemanager/util/FileHelper.java +++ b/src/com/cyanogenmod/filemanager/util/FileHelper.java @@ -827,7 +827,7 @@ public static boolean isSupportedUncompressedFile(FileSystemObject fso) { if (ext != null) { int cc = VALID.length; for (int i = 0; i < cc; i++) { - if (VALID[i].compareTo(ext) == 0) { + if (VALID[i].compareToIgnoreCase(ext) == 0) { return true; } } diff --git a/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java b/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java index 3c7385dc5..b87110ddd 100644 --- a/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java +++ b/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java @@ -213,7 +213,7 @@ public static final String getIcon(Context context, FileSystemObject fso) { //Get the extension and delivery String ext = FileHelper.getExtension(fso); if (ext != null) { - MimeTypeInfo mimeTypeInfo = sMimeTypes.get(ext); + MimeTypeInfo mimeTypeInfo = sMimeTypes.get(ext.toLowerCase()); if (mimeTypeInfo != null) { // Create a new drawable if (!TextUtils.isEmpty(mimeTypeInfo.mDrawable)) { @@ -263,7 +263,7 @@ public static final String getMimeType(Context context, FileSystemObject fso) { String ext = FileHelper.getExtension(fso); if (ext != null) { //Load from the database of mime types - MimeTypeInfo mimeTypeInfo = sMimeTypes.get(ext); + MimeTypeInfo mimeTypeInfo = sMimeTypes.get(ext.toLowerCase()); if (mimeTypeInfo != null) { return mimeTypeInfo.mMimeType; } @@ -312,7 +312,7 @@ public static final String getMimeTypeDescription(Context context, FileSystemObj String ext = FileHelper.getExtension(fso); if (ext != null) { //Load from the database of mime types - MimeTypeInfo mimeTypeInfo = sMimeTypes.get(ext); + MimeTypeInfo mimeTypeInfo = sMimeTypes.get(ext.toLowerCase()); if (mimeTypeInfo != null) { return mimeTypeInfo.mMimeType; } @@ -347,7 +347,7 @@ public static final MimeTypeCategory getCategory(Context context, File file) { String ext = FileHelper.getExtension(file.getName()); if (ext != null) { //Load from the database of mime types - MimeTypeInfo mimeTypeInfo = sMimeTypes.get(ext); + MimeTypeInfo mimeTypeInfo = sMimeTypes.get(ext.toLowerCase()); if (mimeTypeInfo != null) { return mimeTypeInfo.mCategory; } @@ -387,7 +387,7 @@ public static final MimeTypeCategory getCategory(Context context, FileSystemObje String ext = FileHelper.getExtension(fso); if (ext != null) { //Load from the database of mime types - MimeTypeInfo mimeTypeInfo = sMimeTypes.get(ext); + MimeTypeInfo mimeTypeInfo = sMimeTypes.get(ext.toLowerCase()); if (mimeTypeInfo != null) { return mimeTypeInfo.mCategory; }