Skip to content

Commit

Permalink
Merge pull request #1447 from smartdevicelink/bugfix/issue-1446-encry…
Browse files Browse the repository at this point in the history
…ption-error-logs

Don't create the encryption lifecycle manager if it won't be used
  • Loading branch information
joeljfischer authored Oct 16, 2019
2 parents 9d5bafc + 38da617 commit f9668eb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion SmartDeviceLink/SDLLifecycleManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ - (instancetype)initWithConfiguration:(SDLConfiguration *)configuration delegate
SDLLogV(@"Skipping StreamingMediaManager setup due to app type");
}

if (configuration.encryptionConfig != nil) {
if (configuration.encryptionConfig.securityManagers != nil) {
_encryptionLifecycleManager = [[SDLEncryptionLifecycleManager alloc] initWithConnectionManager:self configuration:_configuration.encryptionConfig];
}

Expand Down
1 change: 0 additions & 1 deletion SmartDeviceLink/SDLTextAndGraphicManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,6 @@ - (nullable SDLArtwork *)blankArtwork {

- (void)sdl_displayCapabilityDidUpdate:(SDLSystemCapability *)systemCapability {
// we won't use the object in the parameter but the convenience method of the system capability manager
NSLog(@"PING");
self.windowCapability = self.systemCapabilityManager.defaultMainWindowCapability;

// Auto-send an updated show
Expand Down

0 comments on commit f9668eb

Please sign in to comment.