Merge pull request #573 from zapcannon87/master

release: 11.6.7

Author: zapcannon87

AVOS/AVOSCloud/AVOSCloud.h

@@ -307,6 +307,8 @@ typedef NS_ENUM(NSInteger, AVServiceRegion) {
 
 @interface AVOSCloud (AVDeprecated)
 
++ (void)startNetworkStatistics __deprecated;
+
 /**
  *  Set third party file storage service. If uses China server, you can use QCloud or Qiniu, the default is Qiniu, if uses US server, the default is AWS S3.
  *  @param type Qiniu, QCloud or AWS S3.

AVOS/AVOSCloud/AVOSCloud.m

@@ -108,7 +108,6 @@ + (void)setApplicationId:(NSString *)applicationId clientKey:(NSString *)clientK
     }
 
     [self initializePaasClient];
-    [[LCNetworkStatistics sharedInstance] start];
     [LCRouter sharedInstance];
 
     LCInitialized = YES;
@@ -314,6 +313,10 @@ + (void)handleRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
 
 // MARK: - Deprecated
 
++ (void)startNetworkStatistics {
+    [[LCNetworkStatistics sharedInstance] start];
+}
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 + (void)setStorageType:(AVStorageType)storageType {}

AVOS/AVOSCloud/Push/AVInstallation.m

@@ -73,6 +73,20 @@ - (id)init
     return self;
 }
 
+- (NSString *)hexadecimalStringFromData:(NSData *)data
+{
+    NSUInteger dataLength = data.length;
+    if (dataLength == 0) {
+        return nil;
+    }
+    const unsigned char *dataBuffer = data.bytes;
+    NSMutableString *hexString  = [NSMutableString stringWithCapacity:(dataLength * 2)];
+    for (int i = 0; i < dataLength; ++i) {
+        [hexString appendFormat:@"%02.2hhx", dataBuffer[i]];
+    }
+    return [hexString copy];
+}
+
 - (void)setDeviceTokenFromData:(NSData *)deviceTokenData
 {
     [self setDeviceTokenFromData:deviceTokenData
@@ -82,34 +96,16 @@ - (void)setDeviceTokenFromData:(NSData *)deviceTokenData
 - (void)setDeviceTokenFromData:(NSData *)deviceTokenData
                         teamId:(NSString *)teamId
 {
-    if (!deviceTokenData || deviceTokenData.length == 0) {
-        
+    NSString *newDeviceToken = [self hexadecimalStringFromData:deviceTokenData];
+    if (!newDeviceToken) {
         return;
     }
-    
-    NSCharacterSet *charactersSet = [NSCharacterSet characterSetWithCharactersInString:@"<>"];
-    
-    NSString *newDeviceToken = [deviceTokenData.description stringByTrimmingCharactersInSet:charactersSet];
-    
-    newDeviceToken = [newDeviceToken stringByReplacingOccurrencesOfString:@" " withString:@""];
-    
-    if (newDeviceToken.length == 0) {
-        
-        return;
-    }
-    
     NSString *oldDeviceToken = self.deviceToken;
-    
     NSString *oldTeamId = self.apnsTeamId;
-    
     if (![oldDeviceToken isEqualToString:newDeviceToken] || ![teamId isEqualToString:oldTeamId]) {
-        
         self.deviceToken = newDeviceToken;
-        
         self.apnsTeamId = teamId;
-        
         [self._requestManager synchronize:^{
-            
             [self updateInstallationDictionary:[self._requestManager setDict]];
         }];
     }

AVOS/AVOSCloud/Router/LCRouter.m

@@ -11,7 +11,6 @@
 #import "AVErrorUtils.h"
 #import "AVPaasClient.h"
 #import "AVPersistenceUtils.h"
-#import "LCNetworkStatistics.h"
 
 RouterCacheKey RouterCacheKeyApp = @"RouterCacheDataApp";
 RouterCacheKey RouterCacheKeyRTM = @"RouterCacheDataRTM";
@@ -425,7 +424,6 @@ - (void)customAppServerURL:(NSString *)URLString key:(RouterKey)key
     } else {
         [self->_customAppServerTable removeObjectForKey:key];
     }
-    LCNetworkStatistics.sharedInstance.ignoreAlwaysCollectIfCustomedService = true;
 }
 
 // MARK: - Misc

AVOS/AVOSCloud/Statistics/LCNetworkStatistics.h

@@ -10,8 +10,6 @@
 
 @interface LCNetworkStatistics : NSObject
 
-@property (nonatomic, assign) BOOL ignoreAlwaysCollectIfCustomedService;
-
 + (instancetype)sharedInstance;
 
 - (void)addIncrementalAttribute:(NSInteger)amount forKey:(NSString *)key;

AVOS/AVOSCloud/Statistics/LCNetworkStatistics.m

@@ -59,7 +59,6 @@ - (instancetype)init {
 
     if (self) {
         _cachedStatisticDictLock = [[NSRecursiveLock alloc] init];
-        _ignoreAlwaysCollectIfCustomedService = false;
     }
 
     return self;
@@ -241,11 +240,6 @@ - (BOOL)atTimeToUpload {
 
 - (void)startInBackground
 {
-    if (self.ignoreAlwaysCollectIfCustomedService) {
-        
-        return;
-    }
-    
     NSAssert(![NSThread isMainThread], @"This method must run in background.");
 
     AV_WAIT_WITH_ROUTINE_TIL_TRUE(!self.enable, LCNetworkStatisticsCheckInterval, ({

AVOS/AVOSCloud/UserAgent.h

@@ -1 +1 @@
-#define SDK_VERSION @"v11.6.6"
+#define SDK_VERSION @"v11.6.7"

AVOSCloud.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloud'
-  s.version  = '11.6.6'
+  s.version  = '11.6.7'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud Objective-C SDK'
   s.authors  = 'LeanCloud'

AVOSCloudIM.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloudIM'
-  s.version  = '11.6.6'
+  s.version  = '11.6.7'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud IM Objective-C SDK'
   s.authors  = 'LeanCloud'

AVOSCloudLiveQuery.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloudLiveQuery'
-  s.version  = '11.6.6'
+  s.version  = '11.6.7'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud LiveQuery Objective-C SDK'
   s.authors  = 'LeanCloud'