Merge branch 'develop' into bugfix/issue-1442-generic-getters-nullablebugfix/issue-1442-generic-getters-nullable

4 files changed, 10 insertions, 15 deletions

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 @@ NSString *const BackgroundTaskTransportName = @"com.sdl.transport.backgroundTask
         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];
     }
 
diff --git a/SmartDeviceLink/SDLSystemCapabilityManager.m b/SmartDeviceLink/SDLSystemCapabilityManager.m
index cf1a9e19a..89cce9612 100644
--- a/SmartDeviceLink/SDLSystemCapabilityManager.m
+++ b/SmartDeviceLink/SDLSystemCapabilityManager.m
@@ -117,6 +117,7 @@ typedef NSString * SDLServiceID;
 - (void)stop {
     SDLLogD(@"System Capability manager stopped");
     _displayCapabilities = nil;
+    _displays = nil;
     _hmiCapabilities = nil;
     _softButtonCapabilities = nil;
     _buttonCapabilities = nil;
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 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (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
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRemoteControlCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRemoteControlCapabilitiesSpec.m
index d444905a2..fb914d85c 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRemoteControlCapabilitiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRemoteControlCapabilitiesSpec.m
@@ -24,12 +24,8 @@ __block SDLClimateControlCapabilities* someClimateControlCapabilities = [[SDLCli
 __block SDLRadioControlCapabilities* someRadioControlCapabilities = [[SDLRadioControlCapabilities alloc] init];
 __block SDLButtonCapabilities* someButtonControlCapabilities = [[SDLButtonCapabilities alloc] init];
 __block SDLSeatControlCapabilities* someSeatControlCapabilities = [[SDLSeatControlCapabilities alloc] init];
-
-
 __block SDLAudioControlCapabilities* someAudioControlCapabilities = [[SDLAudioControlCapabilities alloc] init];
-
 __block SDLLightControlCapabilities* someLightControlCapabilities = [[SDLLightControlCapabilities alloc] init];
-
 __block SDLHMISettingsControlCapabilities* someHMISettingsControlCapabilities = [[SDLHMISettingsControlCapabilities alloc] init];
 
 
@@ -48,15 +44,14 @@ describe(@"Initialization tests", ^{
     });
     
     it(@"should properly initialize initWithDictionary", ^{
-        
-        NSMutableDictionary* dict = [@{SDLRPCParameterNameClimateControlCapabilities : [@[someClimateControlCapabilities] copy],
-                                       SDLRPCParameterNameRadioControlCapabilities :[@[someRadioControlCapabilities] copy],
-                                       SDLRPCParameterNameButtonCapabilities :[@[someButtonControlCapabilities] copy],
-                                       SDLRPCParameterNameSeatControlCapabilities:[@[someSeatControlCapabilities]copy],
-                                       SDLRPCParameterNameAudioControlCapabilities :[@[someAudioControlCapabilities] copy],
-                                       SDLRPCParameterNameLightControlCapabilities :[@[someLightControlCapabilities] copy],
-                                       SDLRPCParameterNameHmiSettingsControlCapabilities : [@[someHMISettingsControlCapabilities] copy]
-                                       } mutableCopy];
+        NSDictionary *dict = @{SDLRPCParameterNameClimateControlCapabilities:@[someClimateControlCapabilities],
+                                       SDLRPCParameterNameRadioControlCapabilities:@[someRadioControlCapabilities],
+                                       SDLRPCParameterNameButtonCapabilities:@[someButtonControlCapabilities],
+                                       SDLRPCParameterNameSeatControlCapabilities:@[someSeatControlCapabilities],
+                                       SDLRPCParameterNameAudioControlCapabilities:@[someAudioControlCapabilities],
+                                       SDLRPCParameterNameLightControlCapabilities:someLightControlCapabilities,
+                                       SDLRPCParameterNameHmiSettingsControlCapabilities:someHMISettingsControlCapabilities
+                                       };
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
         SDLRemoteControlCapabilities* testStruct = [[SDLRemoteControlCapabilities alloc] initWithDictionary:dict];