diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2012-11-28 00:39:07 +0100 |
|---|---|---|
| committer | Jorge Ruesga <jorge@ruesga.com> | 2012-11-28 00:44:52 +0100 |
| commit | fa691408c565d9e109c4b8d69a33bd4a746e44c0 (patch) | |
| tree | 0bf4deeb619a98d99468aebe67b28867428f13ec | |
| parent | 77fafd9bb6c0ab9ca98584f920dc5617c22764f5 (diff) | |
| download | android_packages_apps_CMFileManager-fa691408c565d9e109c4b8d69a33bd4a746e44c0.tar.gz android_packages_apps_CMFileManager-fa691408c565d9e109c4b8d69a33bd4a746e44c0.tar.bz2 android_packages_apps_CMFileManager-fa691408c565d9e109c4b8d69a33bd4a746e44c0.zip | |
Issue 6743: CM FileManager can't recognize file types if named with capital suffix
Issue: http://code.google.com/p/cyanogenmod/issues/detail?id=6743
Added case compare to extension and mime/types.
Change-Id: I394472e03b5a92590088fdebbb75dd13ee4bade2
5 files changed, 9 insertions, 9 deletions
diff --git a/res/raw/mime_types.properties b/res/raw/mime_types.properties index a9a8229f..db2d295e 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> +# (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 a4d277f9..0bade8ac 100644 --- a/src/com/cyanogenmod/filemanager/commands/shell/UncompressCommand.java +++ b/src/com/cyanogenmod/filemanager/commands/shell/UncompressCommand.java @@ -342,7 +342,7 @@ public class UncompressCommand extends AsyncResultProgram implements UncompressE 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 6c98f02d..bdefe198 100644 --- a/src/com/cyanogenmod/filemanager/ui/policy/CompressActionPolicy.java +++ b/src/com/cyanogenmod/filemanager/ui/policy/CompressActionPolicy.java @@ -743,7 +743,7 @@ public final class CompressActionPolicy extends ActionsPolicy { // 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 f4f3612e..abf4fed0 100644 --- a/src/com/cyanogenmod/filemanager/util/FileHelper.java +++ b/src/com/cyanogenmod/filemanager/util/FileHelper.java @@ -827,7 +827,7 @@ public final class FileHelper { 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 3c7385dc..b87110dd 100644 --- a/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java +++ b/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java @@ -213,7 +213,7 @@ public final class MimeTypeHelper { //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 final class MimeTypeHelper { 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 final class MimeTypeHelper { 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 final class MimeTypeHelper { 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 final class MimeTypeHelper { 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; } |
