Fix multipart callback and improve test (#77)

Author: nitzanj

cloudinary-android-test/src/main/java/com/cloudinary/test/UploaderTest.java

@@ -91,22 +91,21 @@ public void testUploadProgressCallback() throws Exception {
         if (cloudinary.config.apiSecret == null)
             return;
 
-        final CountDownLatch signal = new CountDownLatch(1);
         final long totalLength = getAssetFileSize(TEST_IMAGE);
+        final long[] totalUploaded = new long[]{0};
 
         ProgressCallback progressCallback = new ProgressCallback() {
             @Override
             public void onProgress(long bytesUploaded, long totalBytes) {
-                if (bytesUploaded == totalLength) {
-                    signal.countDown();
-                }
+                totalUploaded[0] += bytesUploaded;
             }
         };
 
         JSONObject result = new JSONObject(cloudinary.uploader().upload(getAssetStream(TEST_IMAGE), ObjectUtils.asMap("colors", true), progressCallback));
 
-        signal.await(5, TimeUnit.SECONDS);
-        assertEquals(signal.getCount(), 0);
+        assertTrue("ProgressCallback was never called", totalUploaded[0] > 0);
+        assertEquals("ProgressCallback calls do not sum up to actual file length", totalLength, totalUploaded[0]);
+
         assertEquals(result.getLong("width"), 241L);
         assertEquals(result.getLong("height"), 51L);
         assertNotNull(result.get("colors"));

cloudinary-android/src/main/java/com/cloudinary/android/UploaderStrategy.java

@@ -63,7 +63,7 @@ public void totalBytesLoaded(long bytes) {
         HttpURLConnection connection;
 
         try {
-            multipart = new MultipartUtility(apiUrl, "UTF-8", this.cloudinary().randomPublicId(), (Map<String, String>) options.get("extra_headers"));
+            multipart = new MultipartUtility(apiUrl, "UTF-8", this.cloudinary().randomPublicId(), (Map<String, String>) options.get("extra_headers"), multipartCallback);
 
             // Remove blank parameters
             for (Map.Entry<String, Object> param : params.entrySet()) {