Updated Branches: refs/heads/master 3d6274460 -> 7eb12110d
Add a work-around for a FileTransfer bug on 2.3 only. Fixes https://issues.apache.org/jira/browse/CB-1413 Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/7eb12110 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/7eb12110 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/7eb12110 Branch: refs/heads/master Commit: 7eb12110d1ec33481a19adcc0666940972fd520d Parents: 3d62744 Author: Andrew Grieve <agri...@chromium.org> Authored: Fri Sep 21 11:54:24 2012 -0400 Committer: Andrew Grieve <agri...@chromium.org> Committed: Fri Sep 21 11:54:24 2012 -0400 ---------------------------------------------------------------------- framework/src/org/apache/cordova/FileTransfer.java | 59 +++++++++++---- 1 files changed, 44 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/7eb12110/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 67403cb..72adc91 100644 --- a/framework/src/org/apache/cordova/FileTransfer.java +++ b/framework/src/org/apache/cordova/FileTransfer.java @@ -24,6 +24,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; @@ -71,13 +72,46 @@ public class FileTransfer extends Plugin { private SSLSocketFactory defaultSSLSocketFactory = null; private HostnameVerifier defaultHostnameVerifier = null; - private static class AbortException extends Exception { + private static final class AbortException extends Exception { private static final long serialVersionUID = 1L; public AbortException(String str) { super(str); } } + /** + * Works around a bug on Android 2.3. + * http://code.google.com/p/android/issues/detail?id=14562 + */ + private static final class DoneHandlerInputStream extends FilterInputStream { + 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; + } + } + /* (non-Javadoc) * @see org.apache.cordova.api.Plugin#execute(java.lang.String, org.json.JSONArray, java.lang.String) */ @@ -330,13 +364,7 @@ public class FileTransfer extends Plugin { //------------------ read the SERVER RESPONSE StringBuffer responseString = new StringBuffer(""); - DataInputStream inStream; - try { - inStream = new DataInputStream ( conn.getInputStream() ); - } catch(FileNotFoundException e) { - Log.e(LOG_TAG, e.toString(), e); - throw new IOException("Received error from server"); - } + DataInputStream inStream = new DataInputStream(getInputStream(conn)); String line; while (( line = inStream.readLine()) != null) { @@ -390,6 +418,13 @@ public class FileTransfer extends Plugin { } } + private InputStream getInputStream(HttpURLConnection conn) throws IOException { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) { + return new DoneHandlerInputStream(conn.getInputStream()); + } + return conn.getInputStream(); + } + // always verify the host - don't check for certificate final static HostnameVerifier DO_NOT_VERIFY = new HostnameVerifier() { public boolean verify(String hostname, SSLSession session) { @@ -551,13 +586,7 @@ public class FileTransfer extends Plugin { connection.connect(); Log.d(LOG_TAG, "Download file:" + url); - InputStream inputStream; - try { - inputStream = connection.getInputStream(); - } catch(FileNotFoundException e) { - Log.e(LOG_TAG, e.toString(), e); - throw new IOException("Received error from server"); - } + InputStream inputStream = getInputStream(connection); byte[] buffer = new byte[1024]; int bytesRead = 0;
