Fix Android Okhttp issue #93

Author: wkh237

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

@@ -450,8 +450,9 @@ private void done(Response resp) {
                 }
                 break;
         }
+        if(!resp.isSuccessful())
+            resp.body().close();
         removeTaskInfo();
-        resp.close();
     }
 
     /**

src/scripts/prelink.js

@@ -45,15 +45,6 @@ if(VERSION < 0.28) {
   console.log('adding OkHttp3 dependency to pre 0.28 project .. ok')
 }
 
-if(VERSION > 0.30) {
-  let dest = process.cwd() + '/node_modules/react-native-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java'
-  var main = fs.readFileSync(dest);
-  console.log('patching OkHttp3 3.4.1 API ..')
-  main = String(main).replace('// ${OKHTTP 3.4.1 ONLY STATEMENT}', "resp.close();");
-  fs.writeFileSync(dest, main);
-  console.log('patching OkHttp3 3.4.1 API .. ok')
-}
-
 // set file access permission for Android < 6.0
 fs.readFile(MANIFEST_PATH, function(err, data) {
 

test/test-0.9.2.js

@@ -81,67 +81,25 @@ describe('slice test', (report, done) => {
     })
 })
 
+describe('Upload multipart/form-data', (report, done) => {
 
-describe('fs.slice test', (report, done) => {
+  RNFetchBlob.fetch('POST', `${TEST_SERVER_URL}/upload-form`, {
+      Authorization : "Bearer fsXcpmKPrHgAAAAAAAAAEGxFXwhejXM_E8fznZoXPhHbhbNhA-Lytbe6etp1Jznz",
+      'Content-Type' : 'multipart/form-data',
+    }, [
+      // { name : 'test-img', filename : 'test-img.png', data: image},
+      // { name : 'test-text', filename : 'test-text.txt', data: RNFetchBlob.base64.encode('hello.txt')},
+      { name : 'field1', data : 'hello !!'},
+      { name : 'field2', data : 'hello2 !!'}
+    ])
+  .then((resp) => {
+    console.log(resp.json())
+    resp = resp.json()
 
-  let source = null
-  let parts = fs.dirs.DocumentDir + '/tmp-source-'
-  let dests = []
-  let combined = fs.dirs.DocumentDir + '/combined-' + Date.now() + '.jpg'
-  let size = 0
-
-  window.fetch = new RNFetchBlob.polyfill.Fetch({
-    auto : true,
-    binaryContentTypes : ['image/', 'video/', 'audio/']
-  }).build()
-
-  fetch(`${TEST_SERVER_URL}/public/github2.jpg`)
-  .then((res) => res.rawResp())
-  .then((res) => {
-    source = res.path()
-    return fs.stat(source)
-  })
-  // separate file into 4kb chunks
-  .then((stat) => {
-    size = stat.size
-    let promise = Promise.resolve()
-    let cursor = 0
-    while(cursor < size) {
-      promise = promise.then(function(start) {
-        console.log('slicing part ', start , start + 40960)
-        let offset = 0
-        return fs.slice(source, parts + start, start + offset, start + 40960)
-                .then((dest) => {
-                  console.log('slicing part ', start + offset, start + 40960, 'done')
-                  dests.push(dest)
-                  return Promise.resolve()
-                })
-      }.bind(this, cursor))
-      cursor += 40960
-    }
-    console.log('loop end')
-    return promise
-  })
-  // combine chunks and verify the result
-  .then(() => {
-    console.log('combinding files')
-    let p = Promise.resolve()
-    for(let d in dests) {
-      p = p.then(function(chunk){
-        return fs.appendFile(combined, chunk, 'uri').then((write) => {
-          console.log(write, 'bytes write')
-        })
-      }.bind(this, dests[d]))
-    }
-    return p.then(() => fs.stat(combined))
-  })
-  .then((stat) => {
     report(
-      <Assert key="verify file size" expect={size} actual={stat.size}/>,
-      <Info key="image viewer">
-        <Image key="combined image" style={styles.image} source={{ uri : prefix + combined}}/>
-      </Info>)
+      <Assert key="check posted form data #1" expect="hello !!" actual={resp.fields.field1}/>,
+      <Assert key="check posted form data #2" expect="hello2 !!" actual={resp.fields.field2}/>,
+    )
     done()
   })
-
 })

test/test-fs.js

@@ -407,6 +407,71 @@ describe('stat and lstat test', (report, done) => {
 
 })
 
+describe('fs.slice test', (report, done) => {
+
+  let source = null
+  let parts = fs.dirs.DocumentDir + '/tmp-source-'
+  let dests = []
+  let combined = fs.dirs.DocumentDir + '/combined-' + Date.now() + '.jpg'
+  let size = 0
+
+  window.fetch = new RNFetchBlob.polyfill.Fetch({
+    auto : true,
+    binaryContentTypes : ['image/', 'video/', 'audio/']
+  }).build()
+
+  fetch(`${TEST_SERVER_URL}/public/github2.jpg`)
+  .then((res) => res.rawResp())
+  .then((res) => {
+    source = res.path()
+    return fs.stat(source)
+  })
+  // separate file into 4kb chunks
+  .then((stat) => {
+    size = stat.size
+    let promise = Promise.resolve()
+    let cursor = 0
+    while(cursor < size) {
+      promise = promise.then(function(start) {
+        console.log('slicing part ', start , start + 40960)
+        let offset = 0
+        return fs.slice(source, parts + start, start + offset, start + 40960)
+                .then((dest) => {
+                  console.log('slicing part ', start + offset, start + 40960, 'done')
+                  dests.push(dest)
+                  return Promise.resolve()
+                })
+      }.bind(this, cursor))
+      cursor += 40960
+    }
+    console.log('loop end')
+    return promise
+  })
+  // combine chunks and verify the result
+  .then(() => {
+    console.log('combinding files')
+    let p = Promise.resolve()
+    for(let d in dests) {
+      p = p.then(function(chunk){
+        return fs.appendFile(combined, chunk, 'uri').then((write) => {
+          console.log(write, 'bytes write')
+        })
+      }.bind(this, dests[d]))
+    }
+    return p.then(() => fs.stat(combined))
+  })
+  .then((stat) => {
+    report(
+      <Assert key="verify file size" expect={size} actual={stat.size}/>,
+      <Info key="image viewer">
+        <Image key="combined image" style={styles.image} source={{ uri : prefix + combined}}/>
+      </Info>)
+    done()
+  })
+
+})
+
+
 function getASCIIArray(str) {
   let r = []
   for(let i=0;i<str.length;i++) {