diff options
author | Andreas Sandblad <andreas.sandblad@sonyericsson.com> | 2010-08-30 13:30:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 13:30:39 -0700 |
commit | caab8ef3d5eac4b64aef7042078a542bb52f3bda (patch) | |
tree | 9dc9ecc5b256aef12bc34d145bf46a6d67f03b4b /src/com/android/providers/downloads/Helpers.java | |
parent | 05ef8174888d1363db58d2664a58a491abf882f7 (diff) | |
parent | 89e4816fe5f06f4bc2c2fe0e38e63c7fbe468cd7 (diff) | |
download | android_packages_providers_DownloadProvider-caab8ef3d5eac4b64aef7042078a542bb52f3bda.tar.gz android_packages_providers_DownloadProvider-caab8ef3d5eac4b64aef7042078a542bb52f3bda.tar.bz2 android_packages_providers_DownloadProvider-caab8ef3d5eac4b64aef7042078a542bb52f3bda.zip |
am 89e4816f: Added support for downloading files with unicode characters
Merge commit '89e4816fe5f06f4bc2c2fe0e38e63c7fbe468cd7' into gingerbread-plus-aosp
* commit '89e4816fe5f06f4bc2c2fe0e38e63c7fbe468cd7':
Added support for downloading files with unicode characters
Diffstat (limited to 'src/com/android/providers/downloads/Helpers.java')
-rw-r--r-- | src/com/android/providers/downloads/Helpers.java | 54 |
1 files changed, 52 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java index 5d546ff6..794bb062 100644 --- a/src/com/android/providers/downloads/Helpers.java +++ b/src/com/android/providers/downloads/Helpers.java @@ -346,8 +346,9 @@ public class Helpers { filename = Constants.DEFAULT_DL_FILENAME; } - filename = filename.replaceAll("[^a-zA-Z0-9\\.\\-_]+", "_"); - + // The VFAT file system is assumed as target for downloads. + // Replace invalid characters according to the specifications of VFAT. + filename = replaceInvalidVfatCharacters(filename); return filename; } @@ -784,4 +785,53 @@ public class Helpers { (c >= '0' && c <= '9'); } } + + /** + * Replace invalid filename characters according to + * specifications of the VFAT. + * @note Package-private due to testing. + */ + private static String replaceInvalidVfatCharacters(String filename) { + final char START_CTRLCODE = 0x00; + final char END_CTRLCODE = 0x1f; + final char QUOTEDBL = 0x22; + final char ASTERISK = 0x2A; + final char SLASH = 0x2F; + final char COLON = 0x3A; + final char LESS = 0x3C; + final char GREATER = 0x3E; + final char QUESTION = 0x3F; + final char BACKSLASH = 0x5C; + final char BAR = 0x7C; + final char DEL = 0x7F; + final char UNDERSCORE = 0x5F; + + StringBuffer sb = new StringBuffer(); + char ch; + boolean isRepetition = false; + for (int i = 0; i < filename.length(); i++) { + ch = filename.charAt(i); + if ((START_CTRLCODE <= ch && + ch <= END_CTRLCODE) || + ch == QUOTEDBL || + ch == ASTERISK || + ch == SLASH || + ch == COLON || + ch == LESS || + ch == GREATER || + ch == QUESTION || + ch == BACKSLASH || + ch == BAR || + ch == DEL){ + if (!isRepetition) { + sb.append(UNDERSCORE); + isRepetition = true; + } + } else { + sb.append(ch); + isRepetition = false; + } + } + return sb.toString(); + } } |