summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2016-12-02 13:05:58 -0500
committerGitHub <noreply@github.com>2016-12-02 13:05:58 -0500
commitbcb94c5e7701e8b5a2f9b8139fae5b8fb954d83b (patch)
treed353a1e04b25cefa43b7e278e6f9bbbcca70162b
parent7fcd7ce8e695dff700d3fc58f97b534cf97f8c72 (diff)
parent4c628b3820ca53990f028c789669a10f462dfb6f (diff)
downloadsdl_ios-bcb94c5e7701e8b5a2f9b8139fae5b8fb954d83b.tar.gz
Merge pull request #474 from smartdevicelink/feature/issue_470
Allow SecurityManager's AppId to be set earlier on in lifecycle
-rw-r--r--SmartDeviceLink/SDLProxy.m4
-rw-r--r--SmartDeviceLink/SDLSecurityType.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m
index 40e274ff9..b26a12ee6 100644
--- a/SmartDeviceLink/SDLProxy.m
+++ b/SmartDeviceLink/SDLProxy.m
@@ -386,6 +386,10 @@ const int POLICIES_CORRELATION_ID = 65535;
_streamingMediaManager.displayCapabilties = registerResponse.displayCapabilities;
}
self.protocol.securityManager = [self securityManagerForMake:registerResponse.vehicleType.make];
+ if (self.protocol.securityManager
+ && [self.protocol.securityManager respondsToSelector:@selector(setAppId:)]) {
+ self.protocol.securityManager.appId = self.appId;
+ }
if ([SDLGlobals globals].protocolVersion >= 4) {
[self sendMobileHMIState];
diff --git a/SmartDeviceLink/SDLSecurityType.h b/SmartDeviceLink/SDLSecurityType.h
index 86dadd52e..08585f004 100644
--- a/SmartDeviceLink/SDLSecurityType.h
+++ b/SmartDeviceLink/SDLSecurityType.h
@@ -12,6 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
@protocol SDLSecurityType <NSObject>
+@property (copy, nonatomic) NSString* appId;
+
- (void)initializeWithAppId:(NSString *)appId completionHandler:(void (^)(NSError *_Nullable error))completionHandler;
- (void)stop;