diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml
index 5d1998103..fbb68289f 100644
--- a/android/.idea/misc.xml
+++ b/android/.idea/misc.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
index 9ed509688..946a97f5b 100644
--- a/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
+++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
@@ -41,7 +41,7 @@ public String getName() {
}
@ReactMethod
- public void fetchBlob(String method, String url, ReadableMap headers, String body, final Callback callback, final Callback progressEventHandler) {
+ public void fetchBlob(String method, String url, ReadableMap headers, String body, final Callback callback) {
try {
Uri uri = Uri.parse(url);
@@ -71,7 +71,7 @@ public void fetchBlob(String method, String url, ReadableMap headers, String bod
}
// create handler
- AsyncHttpResponseHandler handler = new RNFetchBlobHandler(callback, progressEventHandler);
+ AsyncHttpResponseHandler handler = new RNFetchBlobHandler(callback);
// send request
switch(method.toLowerCase()) {
@@ -95,7 +95,7 @@ public void fetchBlob(String method, String url, ReadableMap headers, String bod
}
@ReactMethod
- public void fetchBlobForm(String method, String url, ReadableMap headers, ReadableArray body, final Callback callback, final Callback progressEventHandler) {
+ public void fetchBlobForm(String method, String url, ReadableMap headers, ReadableArray body, final Callback callback) {
try {
Uri uri = Uri.parse(url);
@@ -154,7 +154,7 @@ public void fetchBlobForm(String method, String url, ReadableMap headers, Readab
}
// create handler
- AsyncHttpResponseHandler handler = new RNFetchBlobHandler(callback, progressEventHandler);
+ AsyncHttpResponseHandler handler = new RNFetchBlobHandler(callback);
// send request
switch(method.toLowerCase()) {
diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobHandler.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobHandler.java
index 18fadb388..0866a1240 100644
--- a/android/src/main/java/com/RNFetchBlob/RNFetchBlobHandler.java
+++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlobHandler.java
@@ -9,11 +9,9 @@
public class RNFetchBlobHandler extends AsyncHttpResponseHandler {
Callback onResponse;
- Callback onProgress;
- RNFetchBlobHandler(Callback onResponse, Callback onProgress) {
+ RNFetchBlobHandler(Callback onResponse) {
this.onResponse = onResponse;
- this.onProgress = onProgress;
}
@Override
@@ -25,9 +23,6 @@ public void onSuccess(int statusCode, Header[] headers, byte[] binaryData) {
@Override
public void onProgress(long bytesWritten, long totalSize) {
super.onProgress(bytesWritten, totalSize);
- if(this.onProgress != null) {
- this.onProgress.invoke(bytesWritten, totalSize);
- }
}
@Override
diff --git a/ios/RNFetchBlob.xcodeproj/project.pbxproj b/ios/RNFetchBlob.xcodeproj/project.pbxproj
index 230f8688f..45b428229 100644
--- a/ios/RNFetchBlob.xcodeproj/project.pbxproj
+++ b/ios/RNFetchBlob.xcodeproj/project.pbxproj
@@ -5,7 +5,6 @@
};
objectVersion = 46;
objects = {
-
/* Begin PBXBuildFile section */
A15C30141CD25C330074CB35 /* RNFetchBlob.m in Sources */ = {isa = PBXBuildFile; fileRef = A15C30131CD25C330074CB35 /* RNFetchBlob.m */; };
A166D1AA1CE0647A00273590 /* RNFetchBlob.h in Sources */ = {isa = PBXBuildFile; fileRef = A15C30111CD25C330074CB35 /* RNFetchBlob.h */; };
@@ -27,6 +26,7 @@
A15C300E1CD25C330074CB35 /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNFetchBlob.a; sourceTree = BUILT_PRODUCTS_DIR; };
A15C30111CD25C330074CB35 /* RNFetchBlob.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNFetchBlob.h; path = RNFetchBlob/RNFetchBlob.h; sourceTree = ""; };
A15C30131CD25C330074CB35 /* RNFetchBlob.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RNFetchBlob.m; path = RNFetchBlob/RNFetchBlob.m; sourceTree = ""; };
+ ADC1D945EE804D3DA47CF622 /* RNFetchBlob.xcodeproj */ = {isa = PBXFileReference; name = "RNFetchBlob.xcodeproj"; path = "../../node_modules/react-native-fetch-blob/ios/RNFetchBlob.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -46,6 +46,7 @@
A15C30111CD25C330074CB35 /* RNFetchBlob.h */,
A15C30131CD25C330074CB35 /* RNFetchBlob.m */,
A15C300F1CD25C330074CB35 /* Products */,
+ 8BD9ABDFAF76406291A798F2 /* Libraries */,
);
sourceTree = "";
};
@@ -57,6 +58,15 @@
name = Products;
sourceTree = "";
};
+ 8BD9ABDFAF76406291A798F2 /* Libraries */ = {
+ isa = PBXGroup;
+ children = (
+ ADC1D945EE804D3DA47CF622 /* RNFetchBlob.xcodeproj */,
+ );
+ name = Libraries;
+ path = "";
+ sourceTree = "";
+ };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -83,7 +93,7 @@
A15C30061CD25C330074CB35 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0730;
+ LastUpgradeCheck = 730;
ORGANIZATIONNAME = suzuri04x2;
TargetAttributes = {
A15C300D1CD25C330074CB35 = {
@@ -214,6 +224,7 @@
"$(SRCROOT)/../../React/**",
"$(SRCROOT)/../../react-native/React/**",
"$(SRCROOT)/../../node_modules/react-native/React/**",
+ "$(SRCROOT)/../../node_modules/react-native-fetch-blob/ios/RNFetchBlob",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -232,6 +243,7 @@
"$(SRCROOT)/../../React/**",
"$(SRCROOT)/../../react-native/React/**",
"$(SRCROOT)/../../node_modules/react-native/React/**",
+ "$(SRCROOT)/../../node_modules/react-native-fetch-blob/ios/RNFetchBlob",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";