Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't create the encryption lifecycle manager if it won't be used #1447

Merged
merged 2 commits into from
Oct 16, 2019
Merged

Don't create the encryption lifecycle manager if it won't be used #1447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
241faf2
Don't create the encryption lifecycle manager if it won't be used
joeljfischer Oct 16, 2019
38da617
Remove errant log
joeljfischer Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SmartDeviceLink/SDLLifecycleManager.m
View file
Open in desktop
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
View file
Open in desktop
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