github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-19 07:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-920: FileTransfer UTF-8 bug

Browse Source
This commit is contained in:
macdonst 2012-06-14 10:33:44 -04:00
parent 34820f4344
commit 838fa5635f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
framework/src/org/apache/cordova/FileTransfer.java
View File

@ -219,9 +219,11 @@ public class FileTransfer extends Plugin {
extraParams += LINE_START + BOUNDARY + LINE_END; extraParams += LINE_START + BOUNDARY + LINE_END;
extraParams += "Content-Disposition: form-data; name=\"" + fileKey + "\";" + " filename=\""; extraParams += "Content-Disposition: form-data; name=\"" + fileKey + "\";" + " filename=\"";
byte[] extraBytes = extraParams.getBytes("UTF-8");
String midParams = "\"" + LINE_END + "Content-Type: " + mimeType + LINE_END + LINE_END; String midParams = "\"" + LINE_END + "Content-Type: " + mimeType + LINE_END + LINE_END;
String tailParams = LINE_END + LINE_START + BOUNDARY + LINE_START + LINE_END; String tailParams = LINE_END + LINE_START + BOUNDARY + LINE_START + LINE_END;
byte[] fileNameBytes = fileName.getBytes("UTF-8");
// Should set this up as an option // Should set this up as an option
if (chunkedMode) { if (chunkedMode) {
@ -229,7 +231,7 @@ public class FileTransfer extends Plugin {
} }
else else
{ {
int stringLength = extraParams.length() + midParams.length() + tailParams.length() + fileName.getBytes("UTF-8").length; int stringLength = extraBytes.length + midParams.length() + tailParams.length() + fileNameBytes.length;
Log.d(LOG_TAG, "String Length: " + stringLength); Log.d(LOG_TAG, "String Length: " + stringLength);
int fixedLength = (int) fileInputStream.getChannel().size() + stringLength; int fixedLength = (int) fileInputStream.getChannel().size() + stringLength;
Log.d(LOG_TAG, "Content Length: " + fixedLength); Log.d(LOG_TAG, "Content Length: " + fixedLength);
@ -238,9 +240,9 @@ public class FileTransfer extends Plugin {
dos = new DataOutputStream( conn.getOutputStream() ); dos = new DataOutputStream( conn.getOutputStream() );
dos.writeBytes(extraParams); //We don't want to change encoding, we just want this to write for all Unicode.
//We don't want to chagne encoding, we just want this to write for all Unicode. dos.write(extraBytes);
dos.write(fileName.getBytes("UTF-8")); dos.write(fileNameBytes);
dos.writeBytes(midParams); dos.writeBytes(midParams);
// create a buffer of maximum size // create a buffer of maximum size