diff options
Diffstat (limited to 'SmartDeviceLink/SDLStreamingMediaConfiguration.m')
| -rw-r--r-- | SmartDeviceLink/SDLStreamingMediaConfiguration.m | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/SmartDeviceLink/SDLStreamingMediaConfiguration.m b/SmartDeviceLink/SDLStreamingMediaConfiguration.m index 93bcf7ebc..d3293bd5a 100644 --- a/SmartDeviceLink/SDLStreamingMediaConfiguration.m +++ b/SmartDeviceLink/SDLStreamingMediaConfiguration.m @@ -16,14 +16,14 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLStreamingMediaConfiguration - (instancetype)init { - return [self initWithSecurityManagers:nil encryptionFlag:SDLStreamingEncryptionFlagNone videoSettings:nil dataSource:nil]; + return [self initWithSecurityManagers:nil encryptionFlag:SDLStreamingEncryptionFlagNone videoSettings:nil dataSource:nil window:nil]; } + (instancetype)insecureConfiguration { return [[self alloc] init]; } -- (instancetype)initWithSecurityManagers:(NSArray<Class<SDLSecurityType>> *_Nullable)securityManagers encryptionFlag:(SDLStreamingEncryptionFlag)encryptionFlag videoSettings:(NSDictionary<NSString *, id> *_Nullable)videoSettings dataSource:(nullable id<SDLStreamingMediaManagerDataSource>)dataSource { +- (instancetype)initWithSecurityManagers:(nullable NSArray<Class<SDLSecurityType>> *)securityManagers encryptionFlag:(SDLStreamingEncryptionFlag)encryptionFlag videoSettings:(nullable NSDictionary<NSString *,id> *)videoSettings dataSource:(nullable id<SDLStreamingMediaManagerDataSource>)dataSource window:(nullable UIWindow *)window { self = [super init]; if (!self) { return nil; @@ -33,6 +33,7 @@ NS_ASSUME_NONNULL_BEGIN _maximumDesiredEncryption = encryptionFlag; _customVideoEncoderSettings = videoSettings; _dataSource = dataSource; + _window = window; return self; } @@ -41,7 +42,7 @@ NS_ASSUME_NONNULL_BEGIN NSAssert(securityManagers.count > 0, @"A secure streaming media configuration requires security managers to be passed."); SDLStreamingEncryptionFlag encryptionFlag = SDLStreamingEncryptionFlagAuthenticateAndEncrypt; - return [self initWithSecurityManagers:securityManagers encryptionFlag:encryptionFlag videoSettings:nil dataSource:nil]; + return [self initWithSecurityManagers:securityManagers encryptionFlag:encryptionFlag videoSettings:nil dataSource:nil window:nil]; } + (instancetype)secureConfigurationWithSecurityManagers:(NSArray<Class<SDLSecurityType>> *)securityManagers { @@ -51,7 +52,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark NSCopying - (id)copyWithZone:(nullable NSZone *)zone { - return [[self.class allocWithZone:zone] initWithSecurityManagers:_securityManagers encryptionFlag:_maximumDesiredEncryption videoSettings:_customVideoEncoderSettings dataSource:_dataSource]; + return [[self.class allocWithZone:zone] initWithSecurityManagers:_securityManagers encryptionFlag:_maximumDesiredEncryption videoSettings:_customVideoEncoderSettings dataSource:_dataSource window:_window]; } @end |