Skip to content

Commit db87a7e

Browse files
longbailongbai
committed
remove bg up
1 parent 12c866c commit db87a7e

File tree

6 files changed

+12
-56
lines changed

6 files changed

+12
-56
lines changed

‎QiniuSDK/Http/QNSessionManager.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
timeout:(UInt32)timeout
1212
urlConverter:(QNUrlConvert)converter
1313
upStatsDropRate:(float)dropRate
14-
dns:(QNDnsManager*)dns
15-
enableBg:(BOOL)bg
16-
sharedContainerIdentifier:(NSString*)identifier;
14+
dns:(QNDnsManager*)dns;
1715

1816
- (void) multipartPost:(NSString *)url
1917
withData:(NSData *)data

‎QiniuSDK/Http/QNSessionManager.m‎

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,16 @@ - (instancetype)initWithProxy:(NSDictionary *)proxyDict
9292
timeout:(UInt32)timeout
9393
urlConverter:(QNUrlConvert)converter
9494
upStatsDropRate:(float)dropRate
95-
dns:(QNDnsManager*)dns
96-
enableBg:(BOOL)bg
97-
sharedContainerIdentifier:(NSString*)identifier{
95+
dns:(QNDnsManager*)dns{
9896
if (self = [super init]) {
9997
if (proxyDict != nil) {
10098
_noProxy = NO;
10199
}
102100
else {
103101
_noProxy = YES;
104102
}
105-
if (bg) {
106-
_httpManager = [QNSessionManager sharedBgHttpManagerWithProxy:proxyDict sharedContainerIdentifier:identifier];
107-
}else{
108-
_httpManager = [QNSessionManager httpManagerWithProxy:proxyDict sharedContainerIdentifier:identifier];
109-
}
103+
104+
_httpManager = [QNSessionManager httpManagerWithProxy:proxyDict];
110105

111106
_timeout = timeout;
112107
_converter = converter;
@@ -117,47 +112,19 @@ - (instancetype)initWithProxy:(NSDictionary *)proxyDict
117112
return self;
118113
}
119114

120-
+ (AFHTTPSessionManager*) httpManagerWithProxy:(NSDictionary *)proxyDict
121-
sharedContainerIdentifier:(NSString*)identifier{
115+
+ (AFHTTPSessionManager*) httpManagerWithProxy:(NSDictionary *)proxyDict{
122116
NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
123117
if (proxyDict != nil) {
124118
configuration.connectionProxyDictionary = proxyDict;
125119
}
126-
127-
if (identifier) {
128-
configuration.sharedContainerIdentifier = identifier;
129-
}
130120

131121
AFHTTPSessionManager *httpManager = [[AFHTTPSessionManager alloc] initWithSessionConfiguration:configuration];
132122
httpManager.responseSerializer = [AFHTTPResponseSerializer serializer];
133123
return httpManager;
134124
}
135125

136-
+ (AFHTTPSessionManager*) sharedBgHttpManagerWithProxy:(NSDictionary *)proxyDict
137-
sharedContainerIdentifier:(NSString*)identifier{
138-
static AFHTTPSessionManager *httpManager = nil;
139-
static dispatch_once_t onceToken;
140-
dispatch_once(&onceToken, ^{
141-
NSURLSessionConfiguration *configuration = nil;
142-
configuration = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:[QNUserAgent sharedInstance].id];
143-
if (identifier) {
144-
configuration.sharedContainerIdentifier = identifier;
145-
}
146-
147-
if (proxyDict != nil) {
148-
configuration.connectionProxyDictionary = proxyDict;
149-
}
150-
151-
httpManager = [[AFHTTPSessionManager alloc] initWithSessionConfiguration:configuration];
152-
httpManager.responseSerializer = [AFHTTPResponseSerializer serializer];
153-
[httpManager setDidFinishEventsForBackgroundURLSessionBlock:^(NSURLSession *session) {}];
154-
});
155-
156-
return httpManager;
157-
}
158-
159126
- (instancetype)init {
160-
return [self initWithProxy:nil timeout:60 urlConverter:nil upStatsDropRate:-1 dns:nil enableBg:NO sharedContainerIdentifier:nil];
127+
return [self initWithProxy:nil timeout:60 urlConverter:nil upStatsDropRate:-1 dns:nil];
161128
}
162129

163130
+ (QNResponseInfo *)buildResponseInfo:(NSHTTPURLResponse *)response

‎QiniuSDK/Storage/QNConfiguration.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@ typedef void (^QNConfigurationBuilderBlock)(QNConfigurationBuilder *builder);
7979

8080
@property (readonly) BOOL disableATS;
8181

82-
@property (readonly) BOOL enableBackgroundUpload;
83-
84-
@property (readonly) NSString* sharedContainerIdentifier;
85-
8682
@property (readonly) float upStatsDropRate;
8783

8884
+ (instancetype)build:(QNConfigurationBuilderBlock)block;

‎QiniuSDK/Storage/QNConfiguration.m‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ - (instancetype)initWithBuilder:(QNConfigurationBuilder *)builder {
8686
}else{
8787
_dns = nil;
8888
}
89-
_enableBackgroundUpload = builder.enableBackgroundUpload;
90-
_sharedContainerIdentifier = builder.sharedContainerIdentifier;
9189
}
9290
return self;
9391
}
@@ -112,9 +110,6 @@ - (instancetype)init {
112110

113111
_disableATS = YES;
114112

115-
_enableBackgroundUpload = NO;
116-
_sharedContainerIdentifier = nil;
117-
118113
_upStatsRate = 0.3;
119114
}
120115
return self;

‎QiniuSDK/Storage/QNUploadManager.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ - (instancetype)initWithConfiguration:(QNConfiguration *)config {
7171
_config = config;
7272
#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
7373
if (hasNSURLSession()) {
74-
_httpManager = [[QNSessionManager alloc] initWithProxy:config.proxy timeout:config.timeoutInterval urlConverter:config.converter upStatsDropRate:-1 dns:config.dns enableBg:config.enableBackgroundUpload sharedContainerIdentifier:config.sharedContainerIdentifier];
74+
_httpManager = [[QNSessionManager alloc] initWithProxy:config.proxy timeout:config.timeoutInterval urlConverter:config.converter upStatsDropRate:-1 dns:config.dns];
7575
}
7676
else {
7777
_httpManager = [[QNHttpManager alloc] initWithTimeout:config.timeoutInterval urlConverter:config.converter upStatsDropRate:config.upStatsDropRate dns:config.dns];

‎QiniuSDKTests/QNSessionTest.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ - (void)testProxy {
9393
(NSString *)kCFStreamPropertyHTTPProxyPort : @8888,
9494
};
9595

96-
QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:proxyDict timeout:60 urlConverter:nil upStatsDropRate:-1 dns:nil enableBg:NO sharedContainerIdentifier:nil];
96+
QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:proxyDict timeout:60 urlConverter:nil upStatsDropRate:-1 dns:nil];
9797
NSData *data = [@"Hello, World!" dataUsingEncoding:NSUTF8StringEncoding];
9898
__block QNResponseInfo *testInfo = nil;
9999
[httpManager post:@"http://up123.qiniu.com" withData:data withParams:nil withHeaders:nil withStats:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
@@ -110,7 +110,7 @@ - (void)testUrlConvert {
110110
return [url stringByReplacingOccurrencesOfString:@"upnono" withString:@"up"];
111111
};
112112

113-
QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:nil timeout:60 urlConverter:c upStatsDropRate:-1 dns:nil enableBg:NO sharedContainerIdentifier:nil];
113+
QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:nil timeout:60 urlConverter:c upStatsDropRate:-1 dns:nil];
114114
NSData *data = [@"Hello, World!" dataUsingEncoding:NSUTF8StringEncoding];
115115
__block QNResponseInfo *testInfo = nil;
116116
[httpManager post:@"http://upnono.qiniu.com" withData:data withParams:nil withHeaders:nil withStats:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
@@ -129,7 +129,7 @@ - (void)testPostIp {
129129
QNResolver *resolver = [[QNResolver alloc] initWithAddres:@"114.114.115.115"];
130130
QNDnsManager *dns = [[QNDnsManager alloc] init:[NSArray arrayWithObject:resolver] networkInfo:[QNNetworkInfo normal]];
131131
[dns putHosts: @"upnonono.qiniu.com" ip: [QNZone zone0].up.ips[0]];
132-
QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:nil timeout:60 urlConverter:nil upStatsDropRate:-1 dns:dns enableBg:NO sharedContainerIdentifier:nil];
132+
QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:nil timeout:60 urlConverter:nil upStatsDropRate:-1 dns:dns];
133133
[httpManager post:@"http://upnonono.qiniu.com" withData:data withParams:nil withHeaders:nil withStats:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
134134
testInfo = info;
135135
} withProgressBlock:nil withCancelBlock:nil];
@@ -141,7 +141,7 @@ - (void)testPostIp {
141141

142142
//- (void)testPostNoPort {
143143
// __block QNResponseInfo *testInfo = nil;
144-
// QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:nil timeout:60 urlConverter:nil upStatsDropRate:-1 dns:nil enableBg:NO sharedContainerIdentifier:nil];
144+
// QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:nil timeout:60 urlConverter:nil upStatsDropRate:-1 dns:nil];
145145
// [httpManager post:@"http://up.qiniug.com:12345/" withData:nil withParams:nil withHeaders:nil withStats:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
146146
// testInfo = info;
147147
// } withProgressBlock:nil withCancelBlock:nil];
@@ -157,7 +157,7 @@ - (void)testPostIp {
157157
// NSData *data = [@"Hello, World!" dataUsingEncoding:NSUTF8StringEncoding];
158158
// QNResolver *resolver = [[QNResolver alloc] initWithAddres:@"114.114.115.115"];
159159
// QNDnsManager *dns = [[QNDnsManager alloc] init:[NSArray arrayWithObject:resolver] networkInfo:[QNNetworkInfo normal]];
160-
// QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:nil timeout:300 urlConverter:nil upStatsDropRate:-1 dns:dns enableBg:NO sharedContainerIdentifier:nil];
160+
// QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:nil timeout:300 urlConverter:nil upStatsDropRate:-1 dns:dns];
161161
// [httpManager post:@"https://up.qbox.me" withData:data withParams:nil withHeaders:nil withStats:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
162162
// testInfo = info;
163163
// } withProgressBlock:nil withCancelBlock:nil];

0 commit comments

Comments
 (0)