Merge pull request #92 from lintianzhi/feature/upstats

QNReachability

Author: longbai

QiniuSDK.xcodeproj/project.pbxproj

@@ -16,7 +16,7 @@
 		BA1659301BDBD6FB00C7304A /* QNStats.h in Headers */ = {isa = PBXBuildFile; fileRef = BA16592E1BDBD6FB00C7304A /* QNStats.h */; settings = {ASSET_TAGS = (); }; };
 		BA1659311BDBD6FB00C7304A /* QNStats.m in Sources */ = {isa = PBXBuildFile; fileRef = BA16592F1BDBD6FB00C7304A /* QNStats.m */; settings = {ASSET_TAGS = (); }; };
 		BA1659321BDBD6FB00C7304A /* QNStats.m in Sources */ = {isa = PBXBuildFile; fileRef = BA16592F1BDBD6FB00C7304A /* QNStats.m */; settings = {ASSET_TAGS = (); }; };
-		BA1A40F61BE497E5009A5E00 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = BA1A40F51BE497E5009A5E00 /* Reachability.m */; settings = {ASSET_TAGS = (); }; };
+		BA1A40FA1BF0B09C009A5E00 /* QNReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = BA1A40F91BF0B09C009A5E00 /* QNReachability.m */; settings = {ASSET_TAGS = (); }; };
 		BA8408531BE250C80093B013 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA8408521BE250C80093B013 /* SystemConfiguration.framework */; };
 		BA8408541BE251010093B013 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA8408521BE250C80093B013 /* SystemConfiguration.framework */; };
 		DF0A03231B3BABEC00E3778C /* libQiniuSDK Mac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DF2CDDFF19DAC05500CE01FB /* libQiniuSDK Mac.dylib */; };
@@ -141,8 +141,8 @@
 		9A0CE9E3B1F13E790C38CB75 /* Pods-QiniuSDK iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK iOSTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK iOSTests/Pods-QiniuSDK iOSTests.release.xcconfig"; sourceTree = "<group>"; };
 		BA16592E1BDBD6FB00C7304A /* QNStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNStats.h; sourceTree = "<group>"; };
 		BA16592F1BDBD6FB00C7304A /* QNStats.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNStats.m; sourceTree = "<group>"; };
-		BA1A40F41BE497E5009A5E00 /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Reachability.h; path = Reachability/Reachability.h; sourceTree = "<group>"; };
-		BA1A40F51BE497E5009A5E00 /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Reachability.m; path = Reachability/Reachability.m; sourceTree = "<group>"; };
+		BA1A40F81BF0B09C009A5E00 /* QNReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QNReachability.h; path = QiniuSDK/QNReachability/QNReachability.h; sourceTree = "<group>"; };
+		BA1A40F91BF0B09C009A5E00 /* QNReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QNReachability.m; path = QiniuSDK/QNReachability/QNReachability.m; sourceTree = "<group>"; };
 		BA8408521BE250C80093B013 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
 		C24CE1990894CD3CA9A17042 /* Pods-QiniuSDK iOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK iOSTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK iOSTests/Pods-QiniuSDK iOSTests.debug.xcconfig"; sourceTree = "<group>"; };
 		DB8C25D8ADEC1AAEAFE9BB8A /* Pods-QiniuSDK iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK iOS/Pods-QiniuSDK iOS.debug.xcconfig"; sourceTree = "<group>"; };
@@ -288,13 +288,13 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		BA0FAD491BE25EB300DD5C51 /* Reachiability */ = {
+		BA1A40F71BF0B079009A5E00 /* QNReachiability */ = {
 			isa = PBXGroup;
 			children = (
-				BA1A40F41BE497E5009A5E00 /* Reachability.h */,
-				BA1A40F51BE497E5009A5E00 /* Reachability.m */,
+				BA1A40F81BF0B09C009A5E00 /* QNReachability.h */,
+				BA1A40F91BF0B09C009A5E00 /* QNReachability.m */,
 			);
-			name = Reachiability;
+			name = QNReachiability;
 			sourceTree = "<group>";
 		};
 		DF293C9B19DBC2AE00799011 /* Http */ = {
@@ -320,6 +320,7 @@
 		DF2CDDF619DAC05500CE01FB = {
 			isa = PBXGroup;
 			children = (
+				BA1A40F71BF0B079009A5E00 /* QNReachiability */,
 				DF2CDE4D19DAC6A400CE01FB /* QiniuSDK */,
 				DF2CDE6F19DAE90300CE01FB /* QiniuSDKTests */,
 				DF2CDE0019DAC05500CE01FB /* Products */,
@@ -342,7 +343,6 @@
 		DF2CDE4D19DAC6A400CE01FB /* QiniuSDK */ = {
 			isa = PBXGroup;
 			children = (
-				BA0FAD491BE25EB300DD5C51 /* Reachiability */,
 				DFA9B65519E0B53700A15FD1 /* Recorder */,
 				DF293C9B19DBC2AE00799011 /* Http */,
 				DF2CDE4E19DAC6A400CE01FB /* Common */,
@@ -796,8 +796,8 @@
 				DF293CA719DC05B800799011 /* QNHttpManager.m in Sources */,
 				DF293CAC19DC0E5300799011 /* QNResumeUpload.m in Sources */,
 				DF437CDC1B2429E10099587B /* QNUpToken.m in Sources */,
-				BA1A40F61BE497E5009A5E00 /* Reachability.m in Sources */,
 				DFF525341A6235D100D02BA1 /* QNSessionManager.m in Sources */,
+				BA1A40FA1BF0B09C009A5E00 /* QNReachability.m in Sources */,
 				DFA39AA719F1272800A1A158 /* QNAsyncRun.m in Sources */,
 				DFA9B64B19E0018800A15FD1 /* QNUploadOption.m in Sources */,
 				DF2CDE6B19DAC6A400CE01FB /* QNUploadManager.m in Sources */,

QiniuSDK/Http/QNStats.h

@@ -13,16 +13,16 @@
 #import "HappyDns.h"
 
 #if TARGET_OS_IPHONE
-#import "Reachability.h"
+#import "QNReachability.h"
 #import <CoreTelephony/CTTelephonyNetworkInfo.h>
 #endif
 
 @interface QNStats : NSObject
 
 #if TARGET_OS_IPHONE
-@property (nonatomic, readonly) Reachability *wifiReach;
+@property (nonatomic, readonly) QNReachability *wifiReach;
 @property (nonatomic, readonly) CTTelephonyNetworkInfo *telephonyInfo;
-@property (atomic, readonly) NetworkStatus reachabilityStatus;
+@property (atomic, readonly) QNNetworkStatus reachabilityStatus;
 #endif
 
 @property (nonatomic,retain) NSTimer *pushTimer;

QiniuSDK/Http/QNStats.m

@@ -8,7 +8,7 @@
 
 #if TARGET_OS_IPHONE
 #import <CoreTelephony/CTTelephonyNetworkInfo.h>
-#import "Reachability.h"
+#import "QNReachability.h"
 #endif
 
 //#import "GZIP.h"
@@ -127,16 +127,16 @@ - (instancetype) initWithPushInterval: (int) interval
 	 }];
 
 	// WiFi, WLAN, or nothing
-	_wifiReach = [Reachability reachabilityForInternetConnection];
+	_wifiReach = [QNReachability reachabilityForInternetConnection];
 	_reachabilityStatus = _wifiReach.currentReachabilityStatus;
 
-	[NSNotificationCenter.defaultCenter addObserverForName:kReachabilityChangedNotification
+	[NSNotificationCenter.defaultCenter addObserverForName:kQNReachabilityChangedNotification
 	 object:nil
 	 queue:nil
 	 usingBlock:^(NSNotification *note) {
 	         _reachabilityStatus = _wifiReach.currentReachabilityStatus;
 
-	         if (_reachabilityStatus != NotReachable) {
+	         if (_reachabilityStatus != QNNotReachable) {
 	                 [self getOutIp];
 		 }
 	 }];
@@ -203,7 +203,7 @@ - (void) pushStats {
 	@synchronized(self) {
 
 #if TARGET_OS_IPHONE
-		if (_reachabilityStatus == NotReachable) {
+		if (_reachabilityStatus == QNNotReachable) {
 			return;
 		}
 #endif
@@ -278,9 +278,9 @@ - (NSString *) getSIP {
 
 - (NSString *) getNetType {
 #if TARGET_OS_IPHONE
-	if (_reachabilityStatus == ReachableViaWiFi) {
+	if (_reachabilityStatus == QNReachableViaWiFi) {
 		return @"wifi";
-	} else if (_reachabilityStatus == ReachableViaWWAN) {
+	} else if (_reachabilityStatus == QNReachableViaWWAN) {
 		return @"wan";
 	}
 #elif TARGET_OS_MAC

QiniuSDK/QNReachability/QNReachability.h

@@ -0,0 +1,96 @@
+/*
+   Copyright (c) 2011, Tony Million.
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+#import <SystemConfiguration/SystemConfiguration.h>
+
+
+/**
+ * Create NS_ENUM macro if it does not exist on the targeted version of iOS or OS X.
+ *
+ * @see http://nshipster.com/ns_enum-ns_options/
+ **/
+#ifndef NS_ENUM
+#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type
+#endif
+
+
+typedef NS_ENUM (NSInteger, QNNetworkStatus) {
+	// Apple NetworkStatus Compatible Names.
+	QNNotReachable = 0,
+	QNReachableViaWiFi = 2,
+	QNReachableViaWWAN = 1
+};
+
+extern NSString *const kQNReachabilityChangedNotification;
+
+@class QNReachability;
+
+typedef void (^NetworkReachable)(QNReachability * reachability);
+typedef void (^NetworkUnreachable)(QNReachability * reachability);
+
+
+@interface QNReachability : NSObject
+
+@property (nonatomic, copy) NetworkReachable reachableBlock;
+@property (nonatomic, copy) NetworkUnreachable unreachableBlock;
+
+@property (nonatomic, assign) BOOL reachableOnWWAN;
+
+
++(QNReachability*)reachabilityWithHostname:(NSString*)hostname;
+// This is identical to the function above, but is here to maintain
+//compatibility with Apples original code. (see .m)
++(QNReachability*)reachabilityWithHostName:(NSString*)hostname;
++(QNReachability*)reachabilityForInternetConnection;
++(QNReachability*)reachabilityWithAddress:(void *)hostAddress;
++(QNReachability*)reachabilityForLocalWiFi;
+
+-(QNReachability *)initWithReachabilityRef:(SCNetworkReachabilityRef)ref;
+
+-(BOOL)startNotifier;
+-(void)stopNotifier;
+
+-(BOOL)isReachable;
+-(BOOL)isReachableViaWWAN;
+-(BOOL)isReachableViaWiFi;
+
+// WWAN may be available, but not active until a connection has been established.
+// WiFi may require a connection for VPN on Demand.
+-(BOOL)isConnectionRequired; // Identical DDG variant.
+-(BOOL)connectionRequired; // Apple's routine.
+// Dynamic, on demand connection?
+-(BOOL)isConnectionOnDemand;
+// Is user intervention required?
+-(BOOL)isInterventionRequired;
+
+-(QNNetworkStatus)currentReachabilityStatus;
+-(SCNetworkReachabilityFlags)reachabilityFlags;
+-(NSString*)currentReachabilityString;
+-(NSString*)currentReachabilityFlags;
+
+@end

QiniuSDK/Reachability/Reachability.m renamed to QiniuSDK/QNReachability/QNReachability.m

@@ -25,7 +25,7 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#import "Reachability.h"
+#import "QNReachability.h"
 
 #import <sys/socket.h>
 #import <netinet/in.h>
@@ -35,10 +35,10 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 #import <netdb.h>
 
 
-NSString *const kReachabilityChangedNotification = @"kReachabilityChangedNotification";
+NSString *const kQNReachabilityChangedNotification = @"kQNReachabilityChangedNotification";
 
 
-@interface Reachability ()
+@interface QNReachability ()
 
 @property (nonatomic, assign) SCNetworkReachabilityRef  reachabilityRef;
 @property (nonatomic, strong) dispatch_queue_t          reachabilitySerialQueue;
@@ -73,7 +73,7 @@ static void TMReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkRea
 {
 #pragma unused (target)
 
-    Reachability *reachability = ((__bridge Reachability*)info);
+    QNReachability *reachability = ((__bridge QNReachability*)info);
 
     // We probably don't need an autoreleasepool here, as GCD docs state each queue has its own autorelease pool,
     // but what the heck eh?
@@ -84,16 +84,16 @@ static void TMReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkRea
 }
 
 
-@implementation Reachability
+@implementation QNReachability
 
 #pragma mark - Class Constructor Methods
 
-+(Reachability*)reachabilityWithHostName:(NSString*)hostname
++(QNReachability*)reachabilityWithHostName:(NSString*)hostname
 {
-    return [Reachability reachabilityWithHostname:hostname];
+    return [QNReachability reachabilityWithHostname:hostname];
 }
 
-+(Reachability*)reachabilityWithHostname:(NSString*)hostname
++(QNReachability*)reachabilityWithHostname:(NSString*)hostname
 {
     SCNetworkReachabilityRef ref = SCNetworkReachabilityCreateWithName(NULL, [hostname UTF8String]);
     if (ref) 
@@ -106,7 +106,7 @@ +(Reachability*)reachabilityWithHostname:(NSString*)hostname
     return nil;
 }
 
-+(Reachability *)reachabilityWithAddress:(void *)hostAddress
++(QNReachability *)reachabilityWithAddress:(void *)hostAddress
 {
     SCNetworkReachabilityRef ref = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, (const struct sockaddr*)hostAddress);
     if (ref) 
@@ -119,7 +119,7 @@ +(Reachability *)reachabilityWithAddress:(void *)hostAddress
     return nil;
 }
 
-+(Reachability *)reachabilityForInternetConnection 
++(QNReachability *)reachabilityForInternetConnection 
 {   
     struct sockaddr_in zeroAddress;
     bzero(&zeroAddress, sizeof(zeroAddress));
@@ -129,7 +129,7 @@ +(Reachability *)reachabilityForInternetConnection
     return [self reachabilityWithAddress:&zeroAddress];
 }
 
-+(Reachability*)reachabilityForLocalWiFi
++(QNReachability*)reachabilityForLocalWiFi
 {
     struct sockaddr_in localWifiAddress;
     bzero(&localWifiAddress, sizeof(localWifiAddress));
@@ -144,7 +144,7 @@ +(Reachability*)reachabilityForLocalWiFi
 
 // Initialization methods
 
--(Reachability *)initWithReachabilityRef:(SCNetworkReachabilityRef)ref 
+-(QNReachability *)initWithReachabilityRef:(SCNetworkReachabilityRef)ref 
 {
     self = [super init];
     if (self != nil) 
@@ -382,19 +382,19 @@ -(BOOL)isInterventionRequired
 
 #pragma mark - reachability status stuff
 
--(NetworkStatus)currentReachabilityStatus
+-(QNNetworkStatus)currentReachabilityStatus
 {
     if([self isReachable])
     {
         if([self isReachableViaWiFi])
-            return ReachableViaWiFi;
+            return QNReachableViaWiFi;
 
 #if	TARGET_OS_IPHONE
-        return ReachableViaWWAN;
+        return QNReachableViaWWAN;
 #endif
     }
 
-    return NotReachable;
+    return QNNotReachable;
 }
 
 -(SCNetworkReachabilityFlags)reachabilityFlags
@@ -411,14 +411,14 @@ -(SCNetworkReachabilityFlags)reachabilityFlags
 
 -(NSString*)currentReachabilityString
 {
-	NetworkStatus temp = [self currentReachabilityStatus];
+	QNNetworkStatus temp = [self currentReachabilityStatus];
 
-	if(temp == ReachableViaWWAN)
+	if(temp == QNReachableViaWWAN)
 	{
         // Updated for the fact that we have CDMA phones now!
 		return NSLocalizedString(@"Cellular", @"");
 	}
-	if (temp == ReachableViaWiFi) 
+	if (temp == QNReachableViaWiFi)
 	{
 		return NSLocalizedString(@"WiFi", @"");
 	}
@@ -452,7 +452,7 @@ -(void)reachabilityChanged:(SCNetworkReachabilityFlags)flags
 
     // this makes sure the change notification happens on the MAIN THREAD
     dispatch_async(dispatch_get_main_queue(), ^{
-        [[NSNotificationCenter defaultCenter] postNotificationName:kReachabilityChangedNotification 
+        [[NSNotificationCenter defaultCenter] postNotificationName:kQNReachabilityChangedNotification 
                                                             object:self];
     });
 }