Skip to content

Commit 0ea4a4a

Browse files
wkh237wkh237
committed
Merge branch '0.10.6'
2 parents 5e41837 + 2c16a94 commit 0ea4a4a

File tree

5 files changed

+87
-37
lines changed

5 files changed

+87
-37
lines changed

‎android.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,26 @@ function actionViewIntent(path:string, mime:string = 'text/plain') {
2121
if(Platform.OS === 'android')
2222
return RNFetchBlob.actionViewIntent(path, mime)
2323
else
24-
return Promise.reject('RNFetchBlob.actionViewIntent only supports Android.')
24+
return Promise.reject('RNFetchBlob.android.actionViewIntent only supports Android.')
2525
}
2626

2727
function getContentIntent(mime:string) {
2828
if(Platform.OS === 'android')
2929
return RNFetchBlob.getContentIntent(mime)
3030
else
31-
return Promise.reject('RNFetchBlob.getContentIntent only supports Android.')
31+
return Promise.reject('RNFetchBlob.android.getContentIntent only supports Android.')
32+
}
33+
34+
function addCompleteDownload(config) {
35+
if(Platform.OS === 'android')
36+
return RNFetchBlob.addCompleteDownload(config)
37+
else
38+
return Promise.reject('RNFetchBlob.android.addCompleteDownload only supports Android.')
3239
}
3340

3441

3542
export default {
3643
actionViewIntent,
37-
getContentIntent
44+
getContentIntent,
45+
addCompleteDownload
3846
}

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.RNFetchBlob;
22

33
import android.app.Activity;
4+
import android.app.DownloadManager;
45
import android.content.Intent;
56
import android.net.Uri;
67

@@ -15,6 +16,7 @@
1516
import com.facebook.react.bridge.ReadableMap;
1617

1718
// Cookies
19+
import com.facebook.react.bridge.WritableMap;
1820
import com.facebook.react.modules.network.ForwardingCookieHandler;
1921
import com.facebook.react.modules.network.CookieJarContainer;
2022
import com.facebook.react.modules.network.OkHttpClientProvider;
@@ -341,4 +343,31 @@ public void getContentIntent(String mime, Promise promise) {
341343

342344
}
343345

346+
@ReactMethod
347+
public void addCompleteDownload (ReadableMap config, Promise promise) {
348+
DownloadManager dm = (DownloadManager) RNFetchBlob.RCTContext.getSystemService(RNFetchBlob.RCTContext.DOWNLOAD_SERVICE);
349+
String path = RNFetchBlobFS.normalizePath(config.getString("path"));
350+
if(path == null) {
351+
promise.reject("RNFetchblob.addCompleteDownload can not resolve URI:" + config.getString("path"), "RNFetchblob.addCompleteDownload can not resolve URI:" + path);
352+
return;
353+
}
354+
try {
355+
WritableMap stat = RNFetchBlobFS.statFile(path);
356+
dm.addCompletedDownload(
357+
config.hasKey("title") ? config.getString("title") : "",
358+
config.hasKey("description") ? config.getString("description") : "",
359+
true,
360+
config.hasKey("mime") ? config.getString("mime") : null,
361+
path,
362+
Long.valueOf(stat.getString("size")),
363+
config.hasKey("showNotification") && config.getBoolean("showNotification")
364+
);
365+
promise.resolve(null);
366+
}
367+
catch(Exception ex) {
368+
promise.reject("RNFetchblob.addCompleteDownload failed", ex.getStackTrace().toString());
369+
}
370+
371+
}
372+
344373
}

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,7 @@ public void readStream(String path, String encoding, int bufferSize, int tick, f
250250
CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
251251
while ((cursor = fs.read(buffer)) != -1) {
252252
encoder.encode(ByteBuffer.wrap(buffer).asCharBuffer());
253-
String chunk = new String(buffer);
254-
if(cursor != bufferSize) {
255-
chunk = chunk.substring(0, cursor);
256-
}
253+
String chunk = new String(buffer, 0, cursor);
257254
emitStreamEvent(streamId, "data", chunk);
258255
if(tick > 0)
259256
SystemClock.sleep(tick);
@@ -882,13 +879,21 @@ static boolean isAsset(String path) {
882879
return false;
883880
}
884881

882+
/**
883+
* Normalize the path, remove URI scheme (xxx://) so that we can handle it.
884+
* @param path URI string.
885+
* @return Normalized string
886+
*/
885887
static String normalizePath(String path) {
886888
if(path == null)
887889
return null;
888-
Uri uri = Uri.parse(path);
889-
if(uri.getScheme() == null) {
890+
if(!path.matches("\\w+\\:.*"))
890891
return path;
892+
if(path.startsWith("file://")) {
893+
return path.replace("file://", "");
891894
}
895+
896+
Uri uri = Uri.parse(path);
892897
if(path.startsWith(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET)) {
893898
return path;
894899
}

‎ios/RNFetchBlobNetwork.m‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ @interface RNFetchBlobNetwork ()
8282
NSMutableArray * redirects;
8383
ResponseFormat responseFormat;
8484
BOOL * followRedirect;
85+
BOOL backgroundTask;
8586
}
8687

8788
@end
@@ -168,6 +169,8 @@ - (void) sendRequest:(__weak NSDictionary * _Nullable )options
168169
self.expectedBytes = 0;
169170
self.receivedBytes = 0;
170171
self.options = options;
172+
173+
backgroundTask = [options valueForKey:@"IOSBackgroundTask"] == nil ? NO : [[options valueForKey:@"IOSBackgroundTask"] boolValue];
171174
followRedirect = [options valueForKey:@"followRedirect"] == nil ? YES : [[options valueForKey:@"followRedirect"] boolValue];
172175
isIncrement = [options valueForKey:@"increment"] == nil ? NO : [[options valueForKey:@"increment"] boolValue];
173176
redirects = [[NSMutableArray alloc] init];
@@ -192,13 +195,12 @@ - (void) sendRequest:(__weak NSDictionary * _Nullable )options
192195

193196
// the session trust any SSL certification
194197
NSURLSessionConfiguration *defaultConfigObject;
195-
if(!followRedirect)
196-
{
197-
defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration];
198-
}
199-
else
198+
199+
defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration];
200+
201+
if(backgroundTask)
200202
{
201-
NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:taskId];
203+
defaultConfigObject = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:taskId];
202204
}
203205

204206
// set request timeout
@@ -247,14 +249,6 @@ - (void) sendRequest:(__weak NSDictionary * _Nullable )options
247249
[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
248250
__block UIApplication * app = [UIApplication sharedApplication];
249251

250-
// #115 handling task expired when application entering backgound for a long time
251-
UIBackgroundTaskIdentifier tid = [app beginBackgroundTaskWithName:taskId expirationHandler:^{
252-
NSLog([NSString stringWithFormat:@"session %@ expired", taskId ]);
253-
[expirationTable setObject:task forKey:taskId];
254-
// comment out this one as it might cause app crash #271
255-
// [app endBackgroundTask:tid];
256-
}];
257-
258252
}
259253

260254
// #115 Invoke fetch.expire event on those expired requests so that the expired event can be handled

‎polyfill/Fetch.js‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,38 @@ class RNFetchBlobFetchPolyfill {
5757
// task is a progress reportable and cancellable Promise, however,
5858
// task.then is not, so we have to extend task.then with progress and
5959
// cancel function
60-
let task = promise
60+
let progressHandler, uploadHandler, cancelHandler
61+
let statefulPromise = promise
6162
.then((body) => {
62-
return RNFetchBlob.config(config)
63-
.fetch(options.method, url, options.headers, body)
63+
let task = RNFetchBlob.config(config)
64+
.fetch(options.method, url, options.headers, body)
65+
if(progressHandler)
66+
task.progress(progressHandler)
67+
if(uploadHandler)
68+
task.uploadProgress(uploadHandler)
69+
if(cancelHandler)
70+
task.cancel()
71+
return task.then((resp) => {
72+
log.verbose('response', resp)
73+
// release blob cache created when sending request
74+
if(blobCache !== null && blobCache instanceof Blob)
75+
blobCache.close()
76+
return Promise.resolve(new RNFetchBlobFetchRepsonse(resp))
77+
})
6478
})
6579

66-
let statefulPromise = task.then((resp) => {
67-
log.verbose('response', resp)
68-
// release blob cache created when sending request
69-
if(blobCache !== null && blobCache instanceof Blob)
70-
blobCache.close()
71-
return Promise.resolve(new RNFetchBlobFetchRepsonse(resp))
72-
})
73-
7480
// extend task.then progress with report and cancelling functions
75-
statefulPromise.cancel = task.cancel
76-
statefulPromise.progress = task.progress
77-
statefulPromise.uploadProgress = task.uploadProgress
81+
statefulPromise.progress = (fn) => {
82+
progressHandler = fn
83+
}
84+
statefulPromise.uploadProgress = (fn) => {
85+
uploadHandler = fn
86+
}
87+
statefulPromise.cancel = () => {
88+
cancelHandler = true
89+
if(task.cancel)
90+
task.cancel()
91+
}
7892

7993
return statefulPromise
8094

0 commit comments

Comments
 (0)