onProgress now returns Long results, for sake of dealing with large files, Closes android-async-http#847

Author: smarek

library/src/main/java/com/loopj/android/http/AsyncHttpResponseHandler.java

@@ -78,6 +78,7 @@
  * });
  * </pre>
  */
+@SuppressWarnings("ALL")
 public abstract class AsyncHttpResponseHandler implements ResponseHandlerInterface {
 
     private static final String LOG_TAG = "AsyncHttpResponseHandler";
@@ -246,7 +247,7 @@ public String getCharset() {
      * @param bytesWritten offset from start of file
      * @param totalSize    total size of file
      */
-    public void onProgress(int bytesWritten, int totalSize) {
+    public void onProgress(long bytesWritten, long totalSize) {
         Log.v(LOG_TAG, String.format("Progress %d from %d (%2.0f%%)", bytesWritten, totalSize, (totalSize > 0) ? (bytesWritten * 1.0 / totalSize) * 100 : -1));
     }
 
@@ -313,7 +314,7 @@ public void onUserException(Throwable error) {
     }
 
     @Override
-    final public void sendProgressMessage(int bytesWritten, int bytesTotal) {
+    final public void sendProgressMessage(long bytesWritten, long bytesTotal) {
         sendMessage(obtainMessage(PROGRESS_MESSAGE, new Object[]{bytesWritten, bytesTotal}));
     }
 
@@ -379,7 +380,7 @@ protected void handleMessage(Message message) {
                     response = (Object[]) message.obj;
                     if (response != null && response.length >= 2) {
                         try {
-                            onProgress((Integer) response[0], (Integer) response[1]);
+                            onProgress((Long) response[0], (Long) response[1]);
                         } catch (Throwable t) {
                             Log.e(LOG_TAG, "custom onProgress contains an error", t);
                         }
@@ -480,12 +481,13 @@ byte[] getResponseData(HttpEntity entity) throws IOException {
                     ByteArrayBuffer buffer = new ByteArrayBuffer(buffersize);
                     try {
                         byte[] tmp = new byte[BUFFER_SIZE];
-                        int l, count = 0;
+                        long count = 0;
+                        int l;
                         // do not send messages if request has been cancelled
                         while ((l = instream.read(tmp)) != -1 && !Thread.currentThread().isInterrupted()) {
                             count += l;
                             buffer.append(tmp, 0, l);
-                            sendProgressMessage(count, (int) (contentLength <= 0 ? 1 : contentLength));
+                            sendProgressMessage(count, (contentLength <= 0 ? 1 : contentLength));
                         }
                     } finally {
                         AsyncHttpClient.silentCloseInputStream(instream);

library/src/main/java/com/loopj/android/http/DataAsyncHttpResponseHandler.java

@@ -27,6 +27,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+@SuppressWarnings("ALL")
 public abstract class DataAsyncHttpResponseHandler extends AsyncHttpResponseHandler {
     private static final String LOG_TAG = "DataAsyncHttpResponseHandler";
 
@@ -105,7 +106,7 @@ byte[] getResponseData(HttpEntity entity) throws IOException {
                         while ((l = instream.read(tmp)) != -1 && !Thread.currentThread().isInterrupted()) {
                             buffer.append(tmp, 0, l);
                             sendProgressDataMessage(copyOfRange(tmp, 0, l));
-                            sendProgressMessage(count, (int) contentLength);
+                            sendProgressMessage(count, contentLength);
                         }
                     } finally {
                         AsyncHttpClient.silentCloseInputStream(instream);

library/src/main/java/com/loopj/android/http/FileAsyncHttpResponseHandler.java

@@ -153,7 +153,7 @@ protected byte[] getResponseData(HttpEntity entity) throws IOException {
                     while ((l = instream.read(tmp)) != -1 && !Thread.currentThread().isInterrupted()) {
                         count += l;
                         buffer.write(tmp, 0, l);
-                        sendProgressMessage(count, (int) contentLength);
+                        sendProgressMessage(count, contentLength);
                     }
                 } finally {
                     AsyncHttpClient.silentCloseInputStream(instream);

library/src/main/java/com/loopj/android/http/JsonStreamerEntity.java

@@ -83,8 +83,8 @@ public JsonStreamerEntity(ResponseHandlerInterface progressHandler, boolean useG
         this.progressHandler = progressHandler;
         this.contentEncoding = useGZipCompression ? HEADER_GZIP_ENCODING : null;
         this.elapsedField = TextUtils.isEmpty(elapsedField)
-          ? null
-          : escape(elapsedField);
+                ? null
+                : escape(elapsedField);
     }
 
     /**
@@ -283,7 +283,8 @@ private void writeToFromFile(OutputStream os, RequestParams.FileWrapper wrapper)
         // Send the meta data.
         writeMetaData(os, wrapper.file.getName(), wrapper.contentType);
 
-        int bytesRead, bytesWritten = 0, totalSize = (int) wrapper.file.length();
+        int bytesRead;
+        long bytesWritten = 0, totalSize = wrapper.file.length();
 
         // Open the file for reading.
         FileInputStream in = new FileInputStream(wrapper.file);

library/src/main/java/com/loopj/android/http/RangeFileAsyncHttpResponseHandler.java

@@ -88,7 +88,7 @@ protected byte[] getResponseData(HttpEntity entity) throws IOException {
                     while (current < contentLength && (l = instream.read(tmp)) != -1 && !Thread.currentThread().isInterrupted()) {
                         current += l;
                         buffer.write(tmp, 0, l);
-                        sendProgressMessage((int) current, (int) contentLength);
+                        sendProgressMessage(current, contentLength);
                     }
                 } finally {
                     instream.close();

library/src/main/java/com/loopj/android/http/ResponseHandlerInterface.java

@@ -53,7 +53,7 @@ public interface ResponseHandlerInterface {
      * @param bytesWritten number of written bytes
      * @param bytesTotal   number of total bytes to be written
      */
-    void sendProgressMessage(int bytesWritten, int bytesTotal);
+    void sendProgressMessage(long bytesWritten, long bytesTotal);
 
     /**
      * Notifies callback, that request was cancelled
@@ -148,7 +148,7 @@ public interface ResponseHandlerInterface {
      * This method is called once by the system when the response is about to be
      * processed by the system. The library makes sure that a single response
      * is pre-processed only once.
-     *
+     * <p/>
      * Please note: pre-processing does NOT run on the main thread, and thus
      * any UI activities that you must perform should be properly dispatched to
      * the app's UI thread.
@@ -162,7 +162,7 @@ public interface ResponseHandlerInterface {
      * This method is called once by the system when the request has been fully
      * sent, handled and finished. The library makes sure that a single response
      * is post-processed only once.
-     *
+     * <p/>
      * Please note: post-processing does NOT run on the main thread, and thus
      * any UI activities that you must perform should be properly dispatched to
      * the app's UI thread.

library/src/main/java/com/loopj/android/http/SimpleMultipartEntity.java

@@ -69,9 +69,9 @@ class SimpleMultipartEntity implements HttpEntity {
 
     private final ResponseHandlerInterface progressHandler;
 
-    private int bytesWritten;
+    private long bytesWritten;
 
-    private int totalSize;
+    private long totalSize;
 
     public SimpleMultipartEntity(ResponseHandlerInterface progressHandler) {
         final StringBuilder buf = new StringBuilder();
@@ -117,6 +117,7 @@ public void addPart(String key, File file) {
     public void addPart(String key, File file, String type) {
         fileParts.add(new FilePart(key, file, normalizeContentType(type)));
     }
+
     public void addPart(String key, File file, String type, String customFileName) {
         fileParts.add(new FilePart(key, file, normalizeContentType(type), customFileName));
     }
@@ -167,7 +168,7 @@ private byte[] createContentDisposition(String key, String fileName) {
                         "; filename=\"" + fileName + "\"" + STR_CR_LF).getBytes();
     }
 
-    private void updateProgress(int count) {
+    private void updateProgress(long count) {
         bytesWritten += count;
         progressHandler.sendProgressMessage(bytesWritten, totalSize);
     }