ADD: allowsCellularAccess property

Change-Id: Ief2f0a07f9bfed96d2bb063fb6b2bbf623890a9b
kanyun-inc · Aug 22, 2016 · aa89c02 · aa89c02 · sensencoder · Sep 7, 2016
1 parent 9436033
commit aa89c02
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/YTKNetwork/YTKBaseRequest.h b/YTKNetwork/YTKBaseRequest.h
@@ -299,12 +299,15 @@ typedef void(^YTKRequestCompletionBlock)(__kindof YTKBaseRequest *request);
 - (nullable NSDictionary<NSString *, NSString *> *)requestHeaderFieldValueDictionary;
 
 ///  Use this to build custom request. If this method return non-nil value, `requestUrl`, `requestTimeoutInterval`,
-///  `requestArgument`, `requestMethod` and `requestSerializerType` will all be ignored.
+///  `requestArgument`, `allowsCellularAccess`, `requestMethod` and `requestSerializerType` will all be ignored.
 - (nullable NSURLRequest *)buildCustomUrlRequest;
 
 ///  Should use CDN when sending request.
 - (BOOL)useCDN;
 
+///  Whether the request is allowed to use the cellular radio (if present). Default is YES.
+- (BOOL)allowsCellularAccess;
+
 ///  The validator will be used to test if `responseJSONObject` is correctly formed.
 - (nullable id)jsonValidator;
 

diff --git a/YTKNetwork/YTKBaseRequest.m b/YTKNetwork/YTKBaseRequest.m
@@ -187,6 +187,10 @@ - (BOOL)useCDN {
     return NO;
 }
 
+- (BOOL)allowsCellularAccess {
+    return YES;
+}
+
 - (id)jsonValidator {
     return nil;
 }

diff --git a/YTKNetwork/YTKNetworkAgent.m b/YTKNetwork/YTKNetworkAgent.m
@@ -146,6 +146,7 @@ - (void)addRequest:(YTKBaseRequest *)request {
     }
 
     requestSerializer.timeoutInterval = [request requestTimeoutInterval];
+    requestSerializer.allowsCellularAccess = [request allowsCellularAccess];
 
     // If api needs server username and password
     NSArray<NSString *> *authorizationHeaderFieldArray = [request requestAuthorizationHeaderFieldArray];
@@ -182,6 +183,7 @@ - (void)addRequest:(YTKBaseRequest *)request {
                 NSString *filteredUrl = [YTKNetworkPrivate urlStringWithOriginUrlString:url appendParameters:param];
                 NSMutableURLRequest *urlRequest = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:filteredUrl]];
                 urlRequest.timeoutInterval = [request requestTimeoutInterval];
+                urlRequest.allowsCellularAccess = [request allowsCellularAccess];
 
                 NSString *downloadTargetPath;
                 BOOL isDirectory;
@@ -237,6 +239,7 @@ - (void)addRequest:(YTKBaseRequest *)request {
                 NSError *serializationError = nil;
                 NSMutableURLRequest *urlRequest = [requestSerializer multipartFormRequestWithMethod:@"POST" URLString:url parameters:param constructingBodyWithBlock:constructingBlock error:&serializationError];
                 urlRequest.timeoutInterval = [request requestTimeoutInterval];
+                urlRequest.allowsCellularAccess = [request allowsCellularAccess];
 
                 if (serializationError) {
                     dispatch_async(_manager.completionQueue ?: dispatch_get_main_queue(), ^{