Change Android fs.readStream implementation

Move readStream to thread pool

Author: wkh237

src/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java

@@ -205,11 +205,17 @@ public void run() {
     /**
      * @param path Stream file path
      * @param encoding Stream encoding, should be one of `base64`, `ascii`, and `utf8`
-     * @param bufferSize Stream buffer size, default to 1024 or 1026(base64).
+     * @param bufferSize Stream buffer size, default to 4096 or 4095(base64).
      */
-    public void readStream(String path, String encoding, int bufferSize, String streamId) {
-        RNFetchBlobFS fs = new RNFetchBlobFS(this.getReactApplicationContext());
-        fs.readStream(path, encoding, bufferSize, streamId);
+    public void readStream(final String path, final String encoding, final int bufferSize, final String streamId) {
+        final ReactApplicationContext ctx = this.getReactApplicationContext();
+        threadPool.execute(new Runnable() {
+            @Override
+            public void run() {
+                RNFetchBlobFS fs = new RNFetchBlobFS(ctx);
+                fs.readStream(path, encoding, bufferSize, streamId);
+            }
+        });
     }
 
     @ReactMethod

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java

@@ -231,74 +231,64 @@ static public String getTmpPath(ReactApplicationContext ctx, String taskId) {
      */
     public void readStream(String path, String encoding, int bufferSize, final String streamId) {
         path = normalizePath(path);
-        AsyncTask<String, Integer, Integer> task = new AsyncTask<String, Integer, Integer>() {
-            @Override
-            protected Integer doInBackground(String ... args) {
-                String path = args[0];
-                String encoding = args[1];
-                int bufferSize = Integer.parseInt(args[2]);
-                try {
+        try {
 
-                    int chunkSize = encoding.equalsIgnoreCase("base64") ? 4095 : 4096;
-                    if(bufferSize > 0)
-                        chunkSize = bufferSize;
+            int chunkSize = encoding.equalsIgnoreCase("base64") ? 4095 : 4096;
+            if(bufferSize > 0)
+                chunkSize = bufferSize;
 
-                    InputStream fs;
-                    if(path.startsWith(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET)) {
-                        fs = RNFetchBlob.RCTContext.getAssets().open(path.replace(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET, ""));
-                    }
-                    else {
-                        fs = new FileInputStream(new File(path));
-                    }
+            InputStream fs;
+            if(path.startsWith(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET)) {
+                fs = RNFetchBlob.RCTContext.getAssets().open(path.replace(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET, ""));
+            }
+            else {
+                fs = new FileInputStream(new File(path));
+            }
 
-                    byte[] buffer = new byte[chunkSize];
-                    int cursor = 0;
-                    boolean error = false;
+            byte[] buffer = new byte[chunkSize];
+            int cursor = 0;
+            boolean error = false;
 
-                    if (encoding.equalsIgnoreCase("utf8")) {
-                        while ((cursor = fs.read(buffer)) != -1) {
-                            String chunk = new String(buffer, 0, cursor, "UTF-8");
-                            emitStreamEvent(streamId, "data", chunk);
-                        }
-                    } else if (encoding.equalsIgnoreCase("ascii")) {
-                        while ((cursor = fs.read(buffer)) != -1) {
-                            WritableArray chunk = Arguments.createArray();
-                            for(int i =0;i<cursor;i++)
-                            {
-                                chunk.pushInt((int)buffer[i]);
-                            }
-                            emitStreamEvent(streamId, "data", chunk);
-                        }
-                    } else if (encoding.equalsIgnoreCase("base64")) {
-                        while ((cursor = fs.read(buffer)) != -1) {
-                            if(cursor < chunkSize) {
-                                byte [] copy = new byte[cursor];
-                                for(int i =0;i<cursor;i++) {
-                                    copy[i] = buffer[i];
-                                }
-                                emitStreamEvent(streamId, "data", Base64.encodeToString(copy, Base64.NO_WRAP));
-                            }
-                            else
-                                emitStreamEvent(streamId, "data", Base64.encodeToString(buffer, Base64.NO_WRAP));
+            if (encoding.equalsIgnoreCase("utf8")) {
+                while ((cursor = fs.read(buffer)) != -1) {
+                    String chunk = new String(buffer, 0, cursor, "UTF-8");
+                    emitStreamEvent(streamId, "data", chunk);
+                }
+            } else if (encoding.equalsIgnoreCase("ascii")) {
+                while ((cursor = fs.read(buffer)) != -1) {
+                    WritableArray chunk = Arguments.createArray();
+                    for(int i =0;i<cursor;i++)
+                    {
+                        chunk.pushInt((int)buffer[i]);
+                    }
+                    emitStreamEvent(streamId, "data", chunk);
+                }
+            } else if (encoding.equalsIgnoreCase("base64")) {
+                while ((cursor = fs.read(buffer)) != -1) {
+                    if(cursor < chunkSize) {
+                        byte [] copy = new byte[cursor];
+                        for(int i =0;i<cursor;i++) {
+                            copy[i] = buffer[i];
                         }
-                    } else {
-                        String msg = "unrecognized encoding `" + encoding + "`";
-                        emitStreamEvent(streamId, "error", msg);
-                        error = true;
+                        emitStreamEvent(streamId, "data", Base64.encodeToString(copy, Base64.NO_WRAP));
                     }
-
-                    if(!error)
-                        emitStreamEvent(streamId, "end", "");
-                    fs.close();
-                    buffer = null;
-
-                } catch (Exception err) {
-                    emitStreamEvent(streamId, "error", err.getLocalizedMessage());
+                    else
+                        emitStreamEvent(streamId, "data", Base64.encodeToString(buffer, Base64.NO_WRAP));
                 }
-                return null;
+            } else {
+                String msg = "unrecognized encoding `" + encoding + "`";
+                emitStreamEvent(streamId, "error", msg);
+                error = true;
             }
-        };
-        task.execute(path, encoding, String.valueOf(bufferSize));
+
+            if(!error)
+                emitStreamEvent(streamId, "end", "");
+            fs.close();
+            buffer = null;
+
+        } catch (Exception err) {
+            emitStreamEvent(streamId, "error", err.getLocalizedMessage());
+        }
     }
 
     /**