config ios8

Author: Kivenhaoyu

QiniuSDK/Common/QNSystem.h

@@ -16,6 +16,6 @@ BOOL hasAts();
 BOOL allowsArbitraryLoads();
 
 //iOS8判断
-BOOL hasDns();
+BOOL isNotIOS8();
 
 #endif /* QNSystem_h */

QiniuSDK/Common/QNSystem.m

@@ -68,7 +68,7 @@ BOOL allowsArbitraryLoads() {
     return ats.boolValue;
 }
 
-BOOL hasDns(){
+BOOL isNotIOS8(){
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
     float sysVersion = [[[UIDevice currentDevice] systemVersion] floatValue];
     if ((sysVersion >= 8.0) && sysVersion < 9.0) {

QiniuSDK/Storage/QNConfiguration.h

@@ -173,6 +173,4 @@ typedef void (^QNConfigurationBuilderBlock)(QNConfigurationBuilder *builder);
 
 @property (assign) BOOL disableATS;
 
-@property (assign) BOOL isNotIOS8;
-
 @end

QiniuSDK/Storage/QNConfiguration.m

@@ -46,12 +46,6 @@ static void addZoneToDns(QNZone *zone, QNDnsManager *dns) {
     return d;
 }
 
-@interface QNConfiguration()
-
-@property (assign) BOOL isNotIOS8;
-
-@end
-
 @implementation QNConfiguration
 
 + (instancetype)build:(QNConfigurationBuilderBlock)block {
@@ -78,8 +72,7 @@ - (instancetype)initWithBuilder:(QNConfigurationBuilder *)builder {
         _converter = builder.converter;
 
         _disableATS = builder.disableATS;
-        _isNotIOS8 = builder.isNotIOS8;
-        if (_disableATS && _isNotIOS8) {
+        if (_disableATS) {
             _dns = initDns(builder);
             addZoneToDns(builder.zone, _dns);
         } else {
@@ -107,13 +100,13 @@ - (instancetype)init {
         _proxy = nil;
         _converter = nil;
 
-        if (hasAts() && !allowsArbitraryLoads()) {
+        if (hasAts() && !allowsArbitraryLoads()&& !isNotIOS8()) {
             _disableATS = NO;
         } else {
             _disableATS = YES;
         }
 
-        _isNotIOS8 = hasDns();
+        
     }
     return self;
 }

QiniuSDKTests/QNFormUploadTest.m

@@ -14,6 +14,7 @@
 
 #import "HappyDns.h"
 #import "QNTestConfig.h"
+#import "QNSystem.h"
 
 @interface QNFormUploadTest : XCTestCase
 
@@ -273,7 +274,7 @@ - (void)testDnsHosts {
     QNResolver *resolver = [[QNResolver alloc] initWithAddres:@"114.114.115.115"];
     QNDnsManager *dns = [[QNDnsManager alloc] init:[NSArray arrayWithObject:resolver] networkInfo:[QNNetworkInfo normal]];
     QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
-        if (builder.isNotIOS8) {
+        if (isNotIOS8()) {
             isNotiOS8 = YES;
             NSArray *ips = [QNZone zone0].up.ips;
             QNServiceAddress *s1 = [[QNServiceAddress alloc] init:@"http://uphosttest.qiniu.com" ips:ips];

QiniuSDKTests/QNResumeUploadTest.m

@@ -265,18 +265,14 @@ - (void)testUrlConvert {
 }
 
 - (void)testHosts {
-    __block BOOL isNotiOS8 = NO;
     QNResolver *resolver = [[QNResolver alloc] initWithAddres:@"114.114.115.115"];
     QNDnsManager *dns = [[QNDnsManager alloc] init:[NSArray arrayWithObject:resolver] networkInfo:[QNNetworkInfo normal]];
     QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
-        if(builder.isNotIOS8){
-            isNotiOS8 = YES;
-            NSArray *ips = [QNZone zone0].up.ips;
-            QNServiceAddress *s1 = [[QNServiceAddress alloc] init:@"http://uphosttest.qiniu.com" ips:ips];
-            QNServiceAddress *s2 = [[QNServiceAddress alloc] init:@"http://uphosttestbak.qiniu.com" ips:ips];
-            builder.zone = [[QNZone alloc] initWithUp:s1 upBackup:s2];
-            builder.dns = dns;
-        }
+        NSArray *ips = [QNZone zone0].up.ips;
+        QNServiceAddress *s1 = [[QNServiceAddress alloc] init:@"http://uphosttest.qiniu.com" ips:ips];
+        QNServiceAddress *s2 = [[QNServiceAddress alloc] init:@"http://uphosttestbak.qiniu.com" ips:ips];
+        builder.zone = [[QNZone alloc] initWithUp:s1 upBackup:s2];
+        builder.dns = dns;
     }];
 
     QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
@@ -296,12 +292,7 @@ - (void)testHosts {
     NSLog(@"info %@", info);
     XCTAssert(info.isOK, @"Pass");
     XCTAssert([keyUp isEqualToString:key], @"Pass");
-    if(isNotiOS8){
     XCTAssert([info.host isEqual:@"uphosttest.qiniu.com"] || [info.host isEqual:@"uphosttestbak.qiniu.com"], @"Pass");
-    }else
-    {
-        XCTAssert([info.host isEqual:@"upload.qiniu.com"], @"Pass");
-    }
     [QNTempFile removeTempfile:tempFile];
 }