aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Connect
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-12 22:46:44 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-12 22:46:44 -0500
commitd8d5dd487326dd3fccf4e9f30cd8f7e3783fcfda (patch)
treecf9950d32ee194d72a367c836a70dfb8f4e61401 /MediaBrowser.Server.Implementations/Connect
parentf55217406985ad21da44aa523353f33e3f720ccd (diff)
make channel access opt-in rather than opt out
Diffstat (limited to 'MediaBrowser.Server.Implementations/Connect')
-rw-r--r--MediaBrowser.Server.Implementations/Connect/ConnectManager.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index 67d844543..b703b204e 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -548,7 +548,7 @@ namespace MediaBrowser.Server.Implementations.Connect
ImageUrl = response.UserImageUrl,
UserName = response.UserName,
ExcludedLibraries = request.ExcludedLibraries,
- ExcludedChannels = request.ExcludedChannels,
+ EnabledChannels = request.EnabledChannels,
EnableLiveTv = request.EnableLiveTv,
AccessToken = accessToken
});
@@ -810,7 +810,8 @@ namespace MediaBrowser.Server.Implementations.Connect
{
user.Policy.EnableLiveTvAccess = currentPendingEntry.EnableLiveTv;
user.Policy.BlockedMediaFolders = currentPendingEntry.ExcludedLibraries;
- user.Policy.BlockedChannels = currentPendingEntry.ExcludedChannels;
+ user.Policy.EnabledChannels = currentPendingEntry.EnabledChannels;
+ user.Policy.EnableAllChannels = false;
}
await _userManager.UpdateConfiguration(user.Id.ToString("N"), user.Configuration);
@@ -937,7 +938,7 @@ namespace MediaBrowser.Server.Implementations.Connect
{
ConnectUserId = i.ConnectUserId,
EnableLiveTv = i.EnableLiveTv,
- ExcludedChannels = i.ExcludedChannels,
+ EnabledChannels = i.EnabledChannels,
ExcludedLibraries = i.ExcludedLibraries,
Id = i.Id,
ImageUrl = i.ImageUrl,