diff options
| author | NicoleYarroch <nicole@livio.io> | 2017-10-05 10:45:58 -0400 |
|---|---|---|
| committer | NicoleYarroch <nicole@livio.io> | 2017-10-05 10:45:58 -0400 |
| commit | d2a9561441ab9bfdc2efa680c92fe40671f16361 (patch) | |
| tree | 61c7ef0fb306e6cdca2c0023ed2c5352ac2df345 | |
| parent | 6b227f787f9b2de692869e8df42954f74d6332e8 (diff) | |
| download | sdl_ios-d2a9561441ab9bfdc2efa680c92fe40671f16361.tar.gz | |
Fixed timout length
Signed-off-by: NicoleYarroch <nicole@livio.io>
| -rw-r--r-- | SmartDeviceLink/SDLIAPTransport.m | 5 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLProxy.m | 2 | ||||
| -rw-r--r-- | SmartDeviceLink_Example/Classes/ProxyManager.m | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/SmartDeviceLink/SDLIAPTransport.m b/SmartDeviceLink/SDLIAPTransport.m index 3f5277fe2..d1c2f759a 100644 --- a/SmartDeviceLink/SDLIAPTransport.m +++ b/SmartDeviceLink/SDLIAPTransport.m @@ -70,11 +70,6 @@ int const ProtocolIndexTimeoutSeconds = 20; return; } - if (self.session != nil) { - SDLLogD(@"Data session already in progress. No background task needed."); - return; - } - SDLLogD(@"Starting background task"); self.backgroundTaskId = [[UIApplication sharedApplication] beginBackgroundTaskWithName:BackgroundTaskName expirationHandler:^{ SDLLogD(@"Background task expired"); diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m index d7e7eb60a..ef5eb9857 100644 --- a/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink/SDLProxy.m @@ -42,7 +42,7 @@ typedef void (^URLSessionTaskCompletionHandler)(NSData *data, NSURLResponse *res typedef void (^URLSessionDownloadTaskCompletionHandler)(NSURL *location, NSURLResponse *response, NSError *error); NSString *const SDLProxyVersion = @"4.6.1"; -const float StartSessionTime = 100.0; +const float StartSessionTime = 10.0; const float NotifyProxyClosedDelay = 0.1; const int PoliciesCorrelationId = 65535; static float DefaultConnectionTimeout = 45.0; diff --git a/SmartDeviceLink_Example/Classes/ProxyManager.m b/SmartDeviceLink_Example/Classes/ProxyManager.m index 478ae8296..bd93eb0e9 100644 --- a/SmartDeviceLink_Example/Classes/ProxyManager.m +++ b/SmartDeviceLink_Example/Classes/ProxyManager.m @@ -77,7 +77,7 @@ NS_ASSUME_NONNULL_BEGIN if (self.sdlManager) { return; } SDLLifecycleConfiguration *lifecycleConfig = [self.class sdlex_setLifecycleConfigurationPropertiesOnConfiguration:[SDLLifecycleConfiguration defaultConfigurationWithAppName:SDLAppName appId:SDLAppId]]; - SDLConfiguration *config = [SDLConfiguration configurationWithLifecycle:lifecycleConfig lockScreen:[SDLLockScreenConfiguration enabledConfiguration] logging:[SDLLogConfiguration debugConfiguration]]; + SDLConfiguration *config = [SDLConfiguration configurationWithLifecycle:lifecycleConfig lockScreen:[SDLLockScreenConfiguration enabledConfiguration] logging:[self.class sdlex_logConfiguration]]; self.sdlManager = [[SDLManager alloc] initWithConfiguration:config delegate:self]; [self startManager]; @@ -198,6 +198,7 @@ NS_ASSUME_NONNULL_BEGIN SDLLogFileModule *sdlExampleModule = [SDLLogFileModule moduleWithName:@"SDL Example" files:[NSSet setWithArray:@[@"ProxyManager"]]]; logConfig.modules = [logConfig.modules setByAddingObject:sdlExampleModule]; logConfig.targets = [logConfig.targets setByAddingObject:[SDLLogTargetFile logger]]; + logConfig.globalLogLevel = SDLLogLevelVerbose; // logConfig.filters = [logConfig.filters setByAddingObject:[SDLLogFilter filterByAllowingModules:[NSSet setWithObject:@"Transport"]]]; return logConfig; |