From 241faf2944ef3a2ac9796923027ad983a2ae83f1 Mon Sep 17 00:00:00 2001 From: Joel Fischer Date: Wed, 16 Oct 2019 14:10:58 -0400 Subject: [PATCH 1/2] Don't create the encryption lifecycle manager if it won't be used --- SmartDeviceLink/SDLLifecycleManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLLifecycleManager.m b/SmartDeviceLink/SDLLifecycleManager.m index 6fc6f5b0d..08eabe105 100644 --- a/SmartDeviceLink/SDLLifecycleManager.m +++ b/SmartDeviceLink/SDLLifecycleManager.m @@ -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]; } From 38da61770adef3b9c34123e6a6453ff0a5a97e10 Mon Sep 17 00:00:00 2001 From: Joel Fischer Date: Wed, 16 Oct 2019 14:22:46 -0400 Subject: [PATCH 2/2] Remove errant log --- SmartDeviceLink/SDLTextAndGraphicManager.m | 1 - 1 file changed, 1 deletion(-) diff --git a/SmartDeviceLink/SDLTextAndGraphicManager.m b/SmartDeviceLink/SDLTextAndGraphicManager.m index fcd83432d..0e484176f 100644 --- a/SmartDeviceLink/SDLTextAndGraphicManager.m +++ b/SmartDeviceLink/SDLTextAndGraphicManager.m @@ -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