Release 4.5.18

SensorsAnalyticsSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SensorsAnalyticsSDK"
-  s.version      = "4.5.17"
+  s.version      = "4.5.18"
   s.summary      = "The official iOS SDK of Sensors Analytics."
   s.homepage     = "http://www.sensorsdata.cn"
   s.source       = { :git => 'https://github.com/sensorsdata/sa-sdk-ios.git', :tag => "v#{s.version}" }

SensorsAnalyticsSDK/ChannelMatch/SAChannelMatchManager.m

@@ -263,7 +263,8 @@ - (NSDictionary *)channelPropertiesWithEvent:(NSString *)event {
 }
 
 - (void)archiveTrackChannelEventNames {
-    [[SAStoreManager sharedInstance] setObject:self.trackChannelEventNames forKey:kSAEventPropertyChannelDeviceInfo];
+    NSSet *copyEventNames = [[NSSet alloc] initWithSet:self.trackChannelEventNames copyItems:YES];
+    [[SAStoreManager sharedInstance] setObject:copyEventNames forKey:kSAEventPropertyChannelDeviceInfo];
 }
 
 - (NSDictionary *)channelInfoWithEvent:(NSString *)event {

SensorsAnalyticsSDK/Core/SAConstants.m

@@ -27,10 +27,6 @@
 #import "SensorsAnalyticsSDK+Private.h"
 #import "SACoreResources.h"
 
-#if __has_include("SACoreResources+English.h")
-#import "SACoreResources+English.h"
-#endif
-
 #pragma mark - Track Timer
 NSString *const kSAEventIdSuffix = @"_SATimer";
 
@@ -153,13 +149,8 @@ void sensorsdata_dispatch_safe_sync(dispatch_queue_t queue,DISPATCH_NOESCAPE dis
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
 
-#if __has_include("SACoreResources+English.h")
-        // 获取英文资源
-        languageResources = [SACoreResources englishLanguageResources];
-#else
-        // 默认加载中文资源
-        languageResources = [SACoreResources defaultLanguageResources];
-#endif
+    // 加载语言资源
+    languageResources = [SACoreResources defaultLanguageResources];
 
     });
 

SensorsAnalyticsSDK/Core/SensorsAnalyticsSDK.m

@@ -64,7 +64,7 @@
 #import "SALimitKeyManager.h"
 #import "NSDictionary+SACopyProperties.h"
 
-#define VERSION @"4.5.17"
+#define VERSION @"4.5.18"
 
 void *SensorsAnalyticsQueueTag = &SensorsAnalyticsQueueTag;
 

SensorsAnalyticsSDK/Store/SAFileStorePlugin.m

@@ -72,6 +72,11 @@ - (void)setObject:(nullable id)value forKey:(nonnull NSString *)key {
     if (!key) {
         return;
     }
+    // 屏蔽非法数据类型，防止野指针造成异常
+    if(!value && ![value conformsToProtocol:@protocol(NSCoding)]) {
+        return;
+    }
+
     NSString *filePath = [SAFileStorePlugin filePath:key];
 #if TARGET_OS_IOS
     /* 为filePath文件设置保护等级 */

SensorsAnalyticsTests/Store/SABaseStoreManagerTests.m

@@ -74,7 +74,7 @@ - (void)testSetStringObject {
 }
 
 - (void)testSetArrayObject {
-    NSArray *object = @[@"123"];
+    NSArray *object = @[@"123", @"哈哈哈dabn"];
     [self.manager setObject:object forKey:kSABaseStoreManagerTestsKey];
     XCTAssertTrue([object isEqualToArray:[self.manager objectForKey:kSABaseStoreManagerTestsKey]]);
 }

SensorsAnalyticsTests/Store/SAFileStorePluginTests.m

@@ -63,6 +63,12 @@ - (void)testSetArrayObject {
     XCTAssertTrue([object isEqualToArray:[self.plugin objectForKey:kSAFileStorePluginTestsKey]]);
 }
 
+- (void)testSetNSSetObject {
+    NSSet *set = [[NSSet alloc] initWithArray:@[@"哈哈12casdz", @(123)]];
+    [self.plugin setObject:set forKey:kSAFileStorePluginTestsKey];
+    XCTAssertTrue([set isEqualToSet: [self.plugin objectForKey:kSAFileStorePluginTestsKey]]);
+}
+
 - (void)testSetDictionaryObject {
     NSDictionary *object = @{@"login_id": @"123"};
     [self.plugin setObject:object forKey:kSAFileStorePluginTestsKey];

SpecialFileSources/SACoreResources+English.h

@@ -24,6 +24,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface SACoreResources (English)
 
+/// 加载英文运营商信息
++ (NSDictionary *)englishMcc;
+
 /// 加载英文资源
 + (NSDictionary *)englishLanguageResources;