From ee3261ff558ee734e15af5424f98bb8d8776795f Mon Sep 17 00:00:00 2001 From: Kurt Partridge Date: Wed, 27 Feb 2013 14:12:50 -0800 Subject: [PATCH] [FileEncap7] Extract uploadContents method Change-Id: I018b2726533042dbcb25713ea039aec41c148db2 --- .../inputmethod/research/Uploader.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/java/src/com/android/inputmethod/research/Uploader.java b/java/src/com/android/inputmethod/research/Uploader.java index 14e46cd34..ac64076cb 100644 --- a/java/src/com/android/inputmethod/research/Uploader.java +++ b/java/src/com/android/inputmethod/research/Uploader.java @@ -143,14 +143,7 @@ public final class Uploader { connection.setDoOutput(true); connection.setFixedLengthStreamingMode(contentLength); final OutputStream outputStream = connection.getOutputStream(); - final byte[] buf = new byte[BUF_SIZE]; - int numBytesRead; - while ((numBytesRead = fileInputStream.read(buf)) != -1) { - outputStream.write(buf, 0, numBytesRead); - if (DEBUG) { - Log.d(TAG, new String(buf)); - } - } + uploadContents(fileInputStream, outputStream); if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) { Log.d(TAG, "upload failed: " + connection.getResponseCode()); final InputStream netInputStream = connection.getInputStream(); @@ -184,4 +177,14 @@ public final class Uploader { } return success; } + + private static void uploadContents(final InputStream is, final OutputStream os) + throws IOException { + // TODO: Switch to NIO. + final byte[] buf = new byte[BUF_SIZE]; + int numBytesRead; + while ((numBytesRead = is.read(buf)) != -1) { + os.write(buf, 0, numBytesRead); + } + } }