diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2016-07-28 14:48:08 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2016-07-28 14:48:08 -0400 |
| commit | 7f87d5c3d1856918526a6c81102057deaf6096f3 (patch) | |
| tree | 6e3caca7185b19062b18cd1b2b8e213868a5e548 | |
| parent | e1a9c0f0aa0439b944917a2e7016ac01ec28262f (diff) | |
| download | sdl_ios-7f87d5c3d1856918526a6c81102057deaf6096f3.tar.gz | |
Developers add appId in the same step as adding security managers
| -rw-r--r-- | SmartDeviceLink/SDLProxy.h | 3 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLProxy.m | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/SmartDeviceLink/SDLProxy.h b/SmartDeviceLink/SDLProxy.h index 11e6d7062..43095e2c2 100644 --- a/SmartDeviceLink/SDLProxy.h +++ b/SmartDeviceLink/SDLProxy.h @@ -28,7 +28,6 @@ @property (strong) SDLTimer *startSessionTimer; @property (copy) NSString *debugConsoleGroupName; @property (readonly, copy) NSString *proxyVersion; -@property (copy, nonatomic) NSString *appId; @property (nonatomic, strong, readonly) SDLStreamingMediaManager *streamingMediaManager; - (id)initWithTransport:(SDLAbstractTransport *)transport @@ -47,7 +46,7 @@ - (void)handleProtocolMessage:(SDLProtocolMessage *)msgData; -- (void)addSecurityManagers:(NSArray<Class> *)securityManagerClasses; +- (void)addSecurityManagers:(NSArray<Class> *)securityManagerClasses forAppId:(NSString *)appId; + (void)enableSiphonDebug; + (void)disableSiphonDebug; diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m index 5adf6876a..1f98bec6a 100644 --- a/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink/SDLProxy.m @@ -62,6 +62,7 @@ const int POLICIES_CORRELATION_ID = 65535; SDLLockScreenManager *_lsm; } +@property (copy, nonatomic) NSString *appId; @property (strong, nonatomic) NSMutableSet *mutableProxyListeners; @property (nonatomic, strong, readwrite) SDLStreamingMediaManager *streamingMediaManager; @property (nonatomic, strong) NSMutableDictionary<SDLVehicleMake *, Class> *securityManagers; @@ -186,12 +187,10 @@ const int POLICIES_CORRELATION_ID = 65535; #pragma mark - SecurityManager -- (void)addSecurityManagers:(NSArray<Class> *)securityManagerClasses { +- (void)addSecurityManagers:(NSArray<Class> *)securityManagerClasses forAppId:(NSString *)appId { NSParameterAssert(securityManagerClasses != nil); - - if (self.appId == nil) { - @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:@"The App Id must be set on SDLProxy before calling this method" userInfo:nil]; - } + NSParameterAssert(appId != nil); + self.appId = appId; for (Class securityManagerClass in securityManagerClasses) { if (![securityManagerClass conformsToProtocol:@protocol(SDLSecurityType)]) { |