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

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android

Browse Source
This commit is contained in:
Joe Bowser 2012-08-03 14:08:14 -07:00
commit 03893071fc
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@ import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.util.Log; import android.util.Log;
import android.webkit.CookieManager; import android.webkit.CookieManager;
@ -239,19 +240,17 @@ public class FileTransfer extends Plugin {
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"); byte[] fileNameBytes = fileName.getBytes("UTF-8");
// Should set this up as an option int stringLength = extraBytes.length + midParams.length() + tailParams.length() + fileNameBytes.length;
if (chunkedMode) { Log.d(LOG_TAG, "String Length: " + stringLength);
int fixedLength = (int) fileInputStream.getChannel().size() + stringLength;
Log.d(LOG_TAG, "Content Length: " + fixedLength);
// setFixedLengthStreamingMode causes and OutOfMemoryException on pre-Froyo devices.
// http://code.google.com/p/android/issues/detail?id=3164
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.FROYO && chunkedMode) {
conn.setChunkedStreamingMode(maxBufferSize); conn.setChunkedStreamingMode(maxBufferSize);
} else {
conn.setFixedLengthStreamingMode(fixedLength);
} }
else
{
int stringLength = extraBytes.length + midParams.length() + tailParams.length() + fileNameBytes.length;
Log.d(LOG_TAG, "String Length: " + stringLength);
int fixedLength = (int) fileInputStream.getChannel().size() + stringLength;
Log.d(LOG_TAG, "Content Length: " + fixedLength);
conn.setFixedLengthStreamingMode(fixedLength);
}
dos = new DataOutputStream( conn.getOutputStream() ); dos = new DataOutputStream( conn.getOutputStream() );
//We don't want to change encoding, we just want this to write for all Unicode. //We don't want to change encoding, we just want this to write for all Unicode.