You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/06/11 02:15:19 UTC
[04/32] android commit: [CB-3430] [CB-1413] Remove Old (2.3.3) HTTP
Workaround
[CB-3430] [CB-1413] Remove Old (2.3.3) HTTP Workaround
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/01946dd4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/01946dd4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/01946dd4
Branch: refs/heads/3.0.0
Commit: 01946dd4d6c65670fccbec022a12adb6e05af8e3
Parents: c9e16b2
Author: Ian Clelland <ic...@chromium.org>
Authored: Wed May 22 10:33:57 2013 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Wed May 22 13:57:16 2013 -0400
----------------------------------------------------------------------
.../src/org/apache/cordova/FileTransfer.java | 36 --------------------
1 file changed, 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/01946dd4/framework/src/org/apache/cordova/FileTransfer.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/FileTransfer.java b/framework/src/org/apache/cordova/FileTransfer.java
index c87683f..784c34c 100644
--- a/framework/src/org/apache/cordova/FileTransfer.java
+++ b/framework/src/org/apache/cordova/FileTransfer.java
@@ -178,39 +178,6 @@ public class FileTransfer extends CordovaPlugin {
}
}
- /**
- * Works around a bug on Android 2.3.
- * http://code.google.com/p/android/issues/detail?id=14562
- */
- private static final class DoneHandlerInputStream extends TrackingHTTPInputStream {
- private boolean done;
-
- public DoneHandlerInputStream(InputStream stream) {
- super(stream);
- }
-
- @Override
- public int read() throws IOException {
- int result = done ? -1 : super.read();
- done = (result == -1);
- return result;
- }
-
- @Override
- public int read(byte[] buffer) throws IOException {
- int result = done ? -1 : super.read(buffer);
- done = (result == -1);
- return result;
- }
-
- @Override
- public int read(byte[] bytes, int offset, int count) throws IOException {
- int result = done ? -1 : super.read(bytes, offset, count);
- done = (result == -1);
- return result;
- }
- }
-
@Override
public boolean execute(String action, JSONArray args, final CallbackContext callbackContext) throws JSONException {
if (action.equals("upload") || action.equals("download")) {
@@ -565,9 +532,6 @@ public class FileTransfer extends CordovaPlugin {
}
private static TrackingInputStream getInputStream(URLConnection conn) throws IOException {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
- return new DoneHandlerInputStream(conn.getInputStream());
- }
String encoding = conn.getContentEncoding();
if (encoding != null && encoding.equalsIgnoreCase("gzip")) {
return new TrackingGZIPInputStream(new ExposedGZIPInputStream(conn.getInputStream()));