fix: networkConfig.requestTimeoutInSec change to requestTimeout

Example/GrowingAnalyticsTests/GrowingAnalyticsStartTests/GrowingAnalyticsStartTests.m

@@ -117,7 +117,7 @@ - (void)testDefaultConfiguration_Autotracker {
     XCTAssertEqual(configuration.encryptEnabled, NO);
     XCTAssertEqual(configuration.impressionScale, 0);
     XCTAssertEqualObjects(configuration.dataSourceId, nil);
-    XCTAssertEqualObjects(configuration.networkConfig, nil);
+    XCTAssertEqual(configuration.requestTimeout, 30);
 }
 
 - (void)testSetConfiguration_Autotracker {
@@ -136,9 +136,7 @@ - (void)testSetConfiguration_Autotracker {
     config.encryptEnabled = YES;
     config.impressionScale = 0.5;
     config.dataSourceId = @"12345";
-    GrowingNetworkConfig *networkConfig = [GrowingNetworkConfig config];
-    networkConfig.requestTimeoutInSec = 0.3f;
-    config.networkConfig = networkConfig;
+    config.requestTimeout = 0.3f;
     [GrowingRealAutotracker trackerWithConfiguration:config launchOptions:nil];
 
     GrowingAutotrackConfiguration *configuration = (GrowingAutotrackConfiguration *)GrowingConfigurationManager.sharedInstance.trackConfiguration;
@@ -156,8 +154,7 @@ - (void)testSetConfiguration_Autotracker {
     XCTAssertEqual(configuration.encryptEnabled, YES);
     XCTAssertEqual(configuration.impressionScale, 0.5);
     XCTAssertEqualObjects(configuration.dataSourceId, @"12345");
-    XCTAssertNotNil(configuration.networkConfig);
-    XCTAssertEqual(configuration.networkConfig.requestTimeoutInSec, 0.3f);
+    XCTAssertEqual(configuration.requestTimeout, 0.3f);
 }
 
 - (void)testDefaultConfiguration_Tracker {
@@ -178,7 +175,7 @@ - (void)testDefaultConfiguration_Tracker {
     XCTAssertEqualObjects(configuration.urlScheme, nil);
     XCTAssertEqual(configuration.encryptEnabled, NO);
     XCTAssertEqualObjects(configuration.dataSourceId, nil);
-    XCTAssertEqualObjects(configuration.networkConfig, nil);
+    XCTAssertEqual(configuration.requestTimeout, 30);
 }
 
 - (void)testSetConfiguration_Tracker {
@@ -196,9 +193,7 @@ - (void)testSetConfiguration_Tracker {
     config.urlScheme = @"growing.tracker";
     config.encryptEnabled = YES;
     config.dataSourceId = @"12345";
-    GrowingNetworkConfig *networkConfig = [GrowingNetworkConfig config];
-    networkConfig.requestTimeoutInSec = 0.3f;
-    config.networkConfig = networkConfig;
+    config.requestTimeout = 0.3f;
     [GrowingRealTracker trackerWithConfiguration:config launchOptions:nil];
 
     GrowingTrackConfiguration *configuration = GrowingConfigurationManager.sharedInstance.trackConfiguration;
@@ -215,8 +210,7 @@ - (void)testSetConfiguration_Tracker {
     XCTAssertEqualObjects(configuration.urlScheme, @"growing.tracker");
     XCTAssertEqual(configuration.encryptEnabled, YES);
     XCTAssertEqualObjects(configuration.dataSourceId, @"12345");
-    XCTAssertNotNil(configuration.networkConfig);
-    XCTAssertEqual(configuration.networkConfig.requestTimeoutInSec, 0.3f);
+    XCTAssertEqual(configuration.requestTimeout, 0.3f);
 }
 
 - (void)testVersionNameAndVersionCode {

GrowingTrackerCore/GrowingTrackConfiguration.m

@@ -55,7 +55,7 @@ - (instancetype)initWithProjectId:(NSString *)projectId {
         _idMappingEnabled = NO;
         _urlScheme = nil;
         _encryptEnabled = NO;
-        _networkConfig = nil;
+        _requestTimeout = 30;
 
         // Advert
         _ASAEnabled = NO;
@@ -90,7 +90,7 @@ - (id)copyWithZone:(NSZone *)zone {
     configuration->_idMappingEnabled = _idMappingEnabled;
     configuration->_urlScheme = _urlScheme;
     configuration->_encryptEnabled = _encryptEnabled;
-    configuration->_networkConfig = [_networkConfig copy];
+    configuration->_requestTimeout = _requestTimeout;
 
     // Advert
     configuration->_ASAEnabled = _ASAEnabled;
@@ -103,4 +103,25 @@ - (id)copyWithZone:(NSZone *)zone {
     return configuration;
 }
 
+- (void)setDataUploadInterval:(NSTimeInterval)dataUploadInterval {
+    if (dataUploadInterval <= 0) {
+        return;
+    }
+    _dataUploadInterval = dataUploadInterval;
+}
+
+- (void)setSessionInterval:(NSTimeInterval)sessionInterval {
+    if (sessionInterval <= 0) {
+        return;
+    }
+    _sessionInterval = sessionInterval;
+}
+
+- (void)setRequestTimeout:(NSTimeInterval)requestTimeout {
+    if (requestTimeout <= 0) {
+        return;
+    }
+    _requestTimeout = requestTimeout;
+}
+
 @end

GrowingTrackerCore/Network/Request/GrowingEventRequest.m

@@ -22,7 +22,6 @@
 #import "GrowingTrackerCore/Manager/GrowingConfigurationManager.h"
 #import "GrowingTrackerCore/Network/Request/Adapter/GrowingEventRequestAdapters.h"
 #import "GrowingTrackerCore/Network/Request/Adapter/GrowingRequestAdapter.h"
-#import "GrowingTrackerCore/Public/GrowingNetworkConfig.h"
 #import "GrowingULTimeUtil.h"
 
 @implementation GrowingEventRequest
@@ -76,11 +75,7 @@ - (NSDictionary *)query {
 }
 
 - (NSTimeInterval)timeoutInSeconds {
-    GrowingNetworkConfig *networkConfig = GrowingConfigurationManager.sharedInstance.trackConfiguration.networkConfig;
-    if (networkConfig && networkConfig.requestTimeoutInSec > 0) {
-        return networkConfig.requestTimeoutInSec;
-    }
-    return 60.0f;
+    return [GrowingConfigurationManager sharedInstance].trackConfiguration.requestTimeout;
 }
 
 @end

GrowingTrackerCore/Public/GrowingTrackConfiguration.h

@@ -20,7 +20,6 @@
 #import <Foundation/Foundation.h>
 #import "GrowingEventFilter.h"
 #import "GrowingFieldsIgnore.h"
-#import "GrowingNetworkConfig.h"
 
 FOUNDATION_EXPORT NSString *const kGrowingDefaultDataCollectionServerHost;
 
@@ -40,7 +39,7 @@ FOUNDATION_EXPORT NSString *const kGrowingDefaultDataCollectionServerHost;
 @property (nonatomic, assign) BOOL idMappingEnabled;
 @property (nonatomic, copy) NSString *urlScheme;
 @property (nonatomic, assign) BOOL encryptEnabled;
-@property (nonatomic, copy) GrowingNetworkConfig *networkConfig;
+@property (nonatomic, assign) NSTimeInterval requestTimeout;
 
 - (instancetype)initWithProjectId:(NSString *)projectId;