react-native-blob-util 0.24.10 → 0.24.11

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilReq.java

@@ -217,7 +217,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                             cursor.close();
 
                             ReactNativeBlobUtilProgressConfig reportConfig = getReportProgress(taskId);
-                            float progress = (total > 0) ? written / total : 0;
+                            float progress = (total > 0) ? (float) written / total : 0;
 
                             if (reportConfig != null && reportConfig.shouldReport(progress /* progress */)) {
                                 WritableMap args = Arguments.createMap();

package/android/src/main/java/com/ReactNativeBlobUtil/Response/ReactNativeBlobUtilDefaultResp.java

@@ -67,7 +67,7 @@ public class ReactNativeBlobUtilDefaultResp extends ResponseBody {
             bytesRead += read > 0 ? read : 0;
             ReactNativeBlobUtilProgressConfig reportConfig = ReactNativeBlobUtilReq.getReportProgress(mTaskId);
             long cLen = contentLength();
-            if (reportConfig != null && cLen != 0 && reportConfig.shouldReport(bytesRead / contentLength())) {
+            if (reportConfig != null && cLen != 0 && reportConfig.shouldReport(cLen > 0 ? (float) bytesRead / cLen : 0)) {
                 WritableMap args = Arguments.createMap();
                 args.putString("taskId", mTaskId);
                 args.putString("written", String.valueOf(bytesRead));

package/android/src/main/java/com/ReactNativeBlobUtil/Response/ReactNativeBlobUtilFileResp.java

@@ -123,6 +123,11 @@ public class ReactNativeBlobUtilFileResp extends ResponseBody {
                 bytesDownloaded += read > 0 ? read : 0;
                 if (read > 0) {
                     ofStream.write(bytes, 0, (int) read);
+                    // Forward bytes into the Okio sink too. Without this the buffer
+                    // stays empty and buffered consumers (byteStream()/source().read())
+                    // hit a false EOF after the first 8 KB segment, so any file larger
+                    // than one segment fails with "Download interrupted." (0.24.10 regression).
+                    sink.write(bytes, 0, (int) read);
                 } else if (contentLength() == -1 && read == -1) {
                     // End marker has been received for chunked download
                     isEndMarkerReceived = true;
@@ -133,7 +138,7 @@ public class ReactNativeBlobUtilFileResp extends ResponseBody {
 
                     // For non-chunked download, progress is received / total
                     // For chunked download, progress can be either 0 (started) or 1 (ended)
-                    float progress = (contentLength() != -1) ? bytesDownloaded / contentLength() : ((isEndMarkerReceived) ? 1 : 0);
+                    float progress = (contentLength() != -1) ? (float) bytesDownloaded / contentLength() : ((isEndMarkerReceived) ? 1 : 0);
 
                     if (reportConfig != null && reportConfig.shouldReport(progress /* progress */)) {
                         if (contentLength() != -1) {