change for jzfp

android/src/main/java/com/yoloci/fileupload/FileUploadModule.java

@@ -1,27 +1,18 @@
 package com.yoloci.fileupload;
 
-import android.os.Bundle;
+import android.support.annotation.Nullable;
 
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Callback;
-
-import java.io.DataInputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.io.DataOutputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
-import java.io.FileInputStream;
+import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
 
-import org.json.JSONObject;
+import java.util.Map;
 
 public class FileUploadModule extends ReactContextBaseJavaModule {
 
@@ -34,143 +25,43 @@ public FileUploadModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }
 
+    private void sendEvent(ReactContext reactContext, String eventName, @Nullable WritableMap params) {
+        reactContext
+                .getJSModule(RCTNativeAppEventEmitter.class)
+                .emit(eventName, params);
+    }
+
     @ReactMethod
     public void upload(final ReadableMap options, final Callback callback) {
-        String lineEnd = "\r\n";
-        String twoHyphens = "--";
-        String boundary =  "*****";
-
-        String uploadUrl = options.getString("uploadUrl");
-        String method;
-        if (options.hasKey("method")) {
-            method = options.getString("method");
-        } else {
-            method = "POST";
-        }
-
-        ReadableMap headers = options.getMap("headers");
-        ReadableArray files = options.getArray("files");
-        ReadableMap fields = options.getMap("fields");
-
-
-
-        HttpURLConnection connection = null;
-        DataOutputStream outputStream = null;
-        DataInputStream inputStream = null;
-        URL connectURL = null;
-        FileInputStream fileInputStream = null;
-
-        int bytesRead, bytesAvailable, bufferSize;
-        byte[] buffer;
-        int maxBufferSize = 1*1024*1024;
-
         try {
-
-            connectURL = new URL(uploadUrl);
-
-
-            connection = (HttpURLConnection) connectURL.openConnection();
-
-            // Allow Inputs & Outputs.
-            connection.setDoInput(true);
-            connection.setDoOutput(true);
-            connection.setUseCaches(false);
-
-            connection.setRequestMethod(method);
-
-            // set headers
-            ReadableMapKeySetIterator iterator = headers.keySetIterator();
-            while (iterator.hasNextKey()) {
-                String key = iterator.nextKey();
-                connection.setRequestProperty(key, headers.getString(key));
-            }
-
-
-
-            connection.setRequestProperty("Connection", "Keep-Alive");
-            connection.setRequestProperty("Content-Type", "multipart/form-data;boundary="+boundary);
-
-            outputStream = new DataOutputStream( connection.getOutputStream() );
-
-            // set fields
-            ReadableMapKeySetIterator fieldIterator = fields.keySetIterator();
-            while (fieldIterator.hasNextKey()) {
-                outputStream.writeBytes(twoHyphens + boundary + lineEnd);
-
-                String key = fieldIterator.nextKey();
-                outputStream.writeBytes("Content-Disposition: form-data; name=\"" + key +  "\"" + lineEnd + lineEnd);
-                outputStream.writeBytes(fields.getString(key));
-                outputStream.writeBytes(lineEnd);
-            }
-
-
-            for (int i = 0; i < files.size(); i++) {
-
-                ReadableMap file = files.getMap(i);
-                String filename = file.getString("filename");
-                String filepath = file.getString("filepath");
-                filepath = filepath.replace("file://", "");
-                fileInputStream = new FileInputStream(filepath);
-
-                outputStream.writeBytes(twoHyphens + boundary + lineEnd);
-                outputStream.writeBytes("Content-Disposition: form-data; name=\"image\";filename=\"" + filename + "\"" + lineEnd);
-                outputStream.writeBytes(lineEnd);
-
-                bytesAvailable = fileInputStream.available();
-                bufferSize = Math.min(bytesAvailable, maxBufferSize);
-                buffer = new byte[bufferSize];
-
-                // Read file
-                bytesRead = fileInputStream.read(buffer, 0, bufferSize);
-
-                while (bytesRead > 0) {
-                    outputStream.write(buffer, 0, bufferSize);
-                    bytesAvailable = fileInputStream.available();
-                    bufferSize = Math.min(bytesAvailable, maxBufferSize);
-                    bytesRead = fileInputStream.read(buffer, 0, bufferSize);
+            UploadParams params = new UploadParams();
+            params.options = options;
+
+            params.onTaskCompleted = new UploadParams.OnTaskCompleted() {
+                public void onTaskCompleted(UploadResult res) {
+                    //upload success
+                    if(res.exception == null) {
+                        WritableMap infoMap = Arguments.createMap();
+                        ////infoMap.putInt("jobId", jobId);
+                        infoMap.putInt("statusCode", res.statusCode);
+                        infoMap.putString("responseData", res.responseStr);
+                        ////infoMap.putInt("bytesWritten", res.bytesWritten);
+                        callback.invoke(null, infoMap);
+                    }
                 }
+            };
 
-                outputStream.writeBytes(lineEnd);
-            }
-
-            outputStream.writeBytes(twoHyphens + boundary + twoHyphens + lineEnd);
-
-            // Responses from the server (code and message)
-
-            int serverResponseCode = connection.getResponseCode();
-            String serverResponseMessage = connection.getResponseMessage();
-            if (serverResponseCode != 200) {
-                fileInputStream.close();
-                outputStream.flush();
-                outputStream.close();
-                callback.invoke("Error happened: " + serverResponseMessage, null);
-            } else {
-                BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-                StringBuilder sb = new StringBuilder();
-                String line;
-                while ((line = br.readLine()) != null) {
-                    sb.append(line);
-                }
-                br.close();
-                String data = sb.toString();
-                JSONObject mainObject = new JSONObject();
-                mainObject.put("data", data);
-                mainObject.put("status", serverResponseCode);
-
-                BundleJSONConverter bjc = new BundleJSONConverter();
-                Bundle bundle = bjc.convertToBundle(mainObject);
-                WritableMap map = Arguments.fromBundle(bundle);
-
-                fileInputStream.close();
-                outputStream.flush();
-                outputStream.close();
-                callback.invoke(null, map);
-            }
-
-
-
-        } catch(Exception ex) {
-            callback.invoke("Error happened: " + ex.getMessage(), null);
+            Uploader uploader = new Uploader();
+            uploader.execute(params);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            callback.invoke(makeErrorPayload(ex));
         }
     }
+
+    private WritableMap makeErrorPayload(Exception ex) {
+        WritableMap error = Arguments.createMap();
+        error.putString("message", ex.getMessage());
+        return error;
+    }
 }

android/src/main/java/com/yoloci/fileupload/UploadParams.java

@@ -0,0 +1,29 @@
+package com.yoloci.fileupload;
+
+import java.io.File;
+import java.net.URL;
+import java.util.*;
+
+import com.facebook.react.bridge.ReadableMap;
+
+/**
+ * Created by kys on 7/21/2016.
+ */
+public class UploadParams {
+    public interface OnTaskCompleted {
+        void onTaskCompleted(UploadResult res);
+    }
+
+    public interface OnUploadBegin {
+        void onUploadBegin();
+    }
+
+    public interface OnUploadProgress {
+        void onUploadProgress(int contentLength, int bytesWritten);
+    }
+
+    public ReadableMap options;
+    public OnTaskCompleted onTaskCompleted;
+    public OnUploadBegin onUploadBegin;
+    public OnUploadProgress onUploadProgress;
+}

android/src/main/java/com/yoloci/fileupload/UploadResult.java

@@ -0,0 +1,11 @@
+package com.yoloci.fileupload;
+
+/**
+ * Created by kys on 7/21/2016.
+ */
+public class UploadResult {
+    public int statusCode;
+    public int bytesWritten;
+    public String responseStr;
+    public Exception exception;
+}