Adding a securitymanager now adds the object itself

smartdevicelink · Feb 22, 2016 · 334bc6b · 334bc6b
1 parent f782e8d
commit 334bc6b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.h
@@ -46,7 +46,7 @@
 
 - (void)handleProtocolMessage:(SDLProtocolMessage *)msgData;
 
-- (void)addSecurityManager:(Class)securityManagerClass forMake:(NSString *)vehicleMake;
+- (void)addSecurityManager:(id<SDLSecurityType>)securityManager forMake:(NSString *)vehicleMake;
 
 + (void)enableSiphonDebug;
 + (void)disableSiphonDebug;

diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m
@@ -61,7 +61,7 @@ @interface SDLProxy () {
 
 @property (strong, nonatomic) NSMutableSet *mutableProxyListeners;
 @property (nonatomic, strong, readwrite) SDLStreamingMediaManager *streamingMediaManager;
-@property (nonatomic, strong) NSMutableDictionary<SDLVehicleMake *, Class> *securityManagers;
+@property (nonatomic, strong) NSMutableDictionary<SDLVehicleMake *, id<SDLSecurityType>> *securityManagers;
 
 @end
 
@@ -76,6 +76,7 @@ - (instancetype)initWithTransport:(SDLAbstractTransport *)transport protocol:(SD
         _alreadyDestructed = NO;
 
         _mutableProxyListeners = [NSMutableSet setWithObject:theDelegate];
+        _securityManagers = [NSMutableDictionary dictionary];
         _protocol = protocol;
         _transport = transport;
         _transport.delegate = protocol;
@@ -152,18 +153,16 @@ - (SDLStreamingMediaManager *)streamingMediaManager {
 
 #pragma mark - SecurityManager
 
-- (void)addSecurityManager:(Class)securityManagerClass forMake:(NSString *)vehicleMake {
-    if ([securityManagerClass conformsToProtocol:@protocol(SDLSecurityType)]) {
-        self.securityManagers[vehicleMake] = securityManagerClass;
-    } else {
-        @throw [NSException exceptionWithName:@"Unknown Security Manager" reason:@"A security manager was set that does not conform to the SDLSecurityType protocol" userInfo:nil];
-    }
+- (void)addSecurityManager:(id<SDLSecurityType>)securityManager forMake:(NSString *)vehicleMake {
+    NSParameterAssert(securityManager != nil);
+    NSParameterAssert(vehicleMake != nil);
+
+    self.securityManagers[vehicleMake] = securityManager;
 }
 
 - (id<SDLSecurityType>)securityManagerForMake:(NSString *)make {
     if ((make != nil) && (self.securityManagers[make] != nil)) {
-        Class securityManagerClass = self.securityManagers[make];
-        return [[securityManagerClass alloc] init];
+        return self.securityManagers[make];
     }
 
     return nil;