Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed replacement of unused authentication properties for encryption #434

Merged
merged 1 commit into from Aug 17, 2016
Merged

Fixed replacement of unused authentication properties for encryption #434

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions SmartDeviceLink/SDLStreamingMediaManager.m
View file
Open in desktop
Expand Up @@ -36,8 +36,6 @@ @interface SDLStreamingMediaManager ()
@property (assign, nonatomic, readwrite) BOOL videoSessionConnected;
@property (assign, nonatomic, readwrite) BOOL audioSessionConnected;

@property (assign, nonatomic, readwrite) BOOL videoSessionAuthenticated;
@property (assign, nonatomic, readwrite) BOOL audioSessionAuthenticated;
@property (assign, nonatomic, readwrite) BOOL videoSessionEncrypted;
@property (assign, nonatomic, readwrite) BOOL audioSessionEncrypted;

Expand Down Expand Up @@ -91,8 +89,6 @@ - (instancetype)init {
_currentFrameNumber = 0;
_videoSessionConnected = NO;
_audioSessionConnected = NO;
_videoSessionAuthenticated = NO;
_audioSessionAuthenticated = NO;
_videoSessionEncrypted = NO;
_audioSessionEncrypted = NO;
_protocol = nil;
Expand Down Expand Up @@ -279,7 +275,7 @@ - (void)handleProtocolStartSessionACK:(SDLProtocolHeader *)header {
switch (header.serviceType) {
case SDLServiceType_Audio: {
self.audioSessionConnected = YES;
self.audioSessionAuthenticated = header.encrypted;
self.audioSessionEncrypted = header.encrypted;
self.audioStartBlock(YES, header.encrypted, nil);
self.audioStartBlock = nil;
} break;
Expand All @@ -297,7 +293,7 @@ - (void)handleProtocolStartSessionACK:(SDLProtocolHeader *)header {
}

self.videoSessionConnected = YES;
self.videoSessionAuthenticated = header.encrypted;
self.videoSessionEncrypted = header.encrypted;
self.videoStartBlock(YES, header.encrypted, nil);
self.videoStartBlock = nil;
} break;
Expand Down