aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library/UserManager.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-12-22 02:00:40 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-12-22 02:00:40 -0500
commitfef1d16cec5d3bf22f5efee21595480ca1aaa602 (patch)
tree1e46e0b2b3886d342a24a8ae6af3a512af89adc1 /MediaBrowser.Server.Implementations/Library/UserManager.cs
parent498b58aad0b2df17b3caf34b04dbf3f1438742c5 (diff)
fix user policy serialization
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/UserManager.cs')
-rw-r--r--MediaBrowser.Server.Implementations/Library/UserManager.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 7b95ab681..1d58ad074 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -293,7 +293,7 @@ namespace MediaBrowser.Server.Implementations.Library
private async Task DoPolicyMigration(User user)
{
- if (!user.Configuration.ValuesMigratedToPolicy)
+ if (!user.Configuration.HasMigratedToPolicy)
{
user.Policy.AccessSchedules = user.Configuration.AccessSchedules;
user.Policy.BlockedChannels = user.Configuration.BlockedChannels;
@@ -314,7 +314,7 @@ namespace MediaBrowser.Server.Implementations.Library
await UpdateUserPolicy(user.Id.ToString("N"), user.Policy);
- user.Configuration.ValuesMigratedToPolicy = true;
+ user.Configuration.HasMigratedToPolicy = true;
await UpdateConfiguration(user, user.Configuration, true).ConfigureAwait(false);
}
}
@@ -800,7 +800,7 @@ namespace MediaBrowser.Server.Implementations.Library
{
lock (_policySyncLock)
{
- return (UserPolicy)_jsonSerializer.DeserializeFromFile(typeof(UserPolicy), path);
+ return (UserPolicy)_xmlSerializer.DeserializeFromFile(typeof(UserPolicy), path);
}
}
catch (FileNotFoundException)
@@ -842,7 +842,7 @@ namespace MediaBrowser.Server.Implementations.Library
lock (_policySyncLock)
{
- _jsonSerializer.SerializeToFile(userPolicy, path);
+ _xmlSerializer.SerializeToFile(userPolicy, path);
user.Policy = userPolicy;
}
@@ -881,7 +881,7 @@ namespace MediaBrowser.Server.Implementations.Library
private string GetPolifyFilePath(User user)
{
- return Path.Combine(user.ConfigurationDirectoryPath, "policy.json");
+ return Path.Combine(user.ConfigurationDirectoryPath, "policy.xml");
}
private string GetConfigurationFilePath(User user)