diff options
| -rw-r--r-- | MediaBrowser.Model/ApiClient/IDevice.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Connect/ConnectManager.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Connect/Responses.cs | 5 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Common.Internal.nuspec | 4 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Common.nuspec | 2 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Model.Signed.nuspec | 2 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Server.Core.nuspec | 4 |
7 files changed, 17 insertions, 12 deletions
diff --git a/MediaBrowser.Model/ApiClient/IDevice.cs b/MediaBrowser.Model/ApiClient/IDevice.cs index 0c0f55f9b..84927c20a 100644 --- a/MediaBrowser.Model/ApiClient/IDevice.cs +++ b/MediaBrowser.Model/ApiClient/IDevice.cs @@ -26,12 +26,12 @@ namespace MediaBrowser.Model.ApiClient /// Gets the local images. /// </summary> /// <returns>IEnumerable<LocalFileInfo>.</returns> - IEnumerable<LocalFileInfo> GetLocalPhotos(); + Task<IEnumerable<LocalFileInfo>> GetLocalPhotos(); /// <summary> /// Gets the local videos. /// </summary> /// <returns>IEnumerable<LocalFileInfo>.</returns> - IEnumerable<LocalFileInfo> GetLocalVideos(); + Task<IEnumerable<LocalFileInfo>> GetLocalVideos(); /// <summary> /// Uploads the file. /// </summary> diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index 4ccbc2882..4547960ed 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -523,7 +523,7 @@ namespace MediaBrowser.Server.Implementations.Connect using (var stream = (await _httpClient.Post(options).ConfigureAwait(false)).Content) { } - + return new UserLinkResult { IsNewUserInvitation = true, @@ -922,7 +922,7 @@ namespace MediaBrowser.Server.Implementations.Connect { var user = e.Argument; - //await TryUploadUserPreferences(user, CancellationToken.None).ConfigureAwait(false); + await TryUploadUserPreferences(user, CancellationToken.None).ConfigureAwait(false); } private async Task TryUploadUserPreferences(User user, CancellationToken cancellationToken) @@ -937,7 +937,7 @@ namespace MediaBrowser.Server.Implementations.Connect } var obj = ConnectUserPreferences.FromUserConfiguration(user.Configuration); - var json = _json.SerializeToString(obj); + var json = _json.SerializeToString(new UserPreferencesDto<ConnectUserPreferences> { data = obj }); var url = GetConnectUrl("user/preferences"); url += "?userId=" + user.ConnectUserId; @@ -968,7 +968,7 @@ namespace MediaBrowser.Server.Implementations.Connect private async Task DownloadUserPreferences(User user, CancellationToken cancellationToken) { - + } } } diff --git a/MediaBrowser.Server.Implementations/Connect/Responses.cs b/MediaBrowser.Server.Implementations/Connect/Responses.cs index dd9e140a8..ff2825d73 100644 --- a/MediaBrowser.Server.Implementations/Connect/Responses.cs +++ b/MediaBrowser.Server.Implementations/Connect/Responses.cs @@ -72,4 +72,9 @@ namespace MediaBrowser.Server.Implementations.Connect } } + + public class UserPreferencesDto<T> + { + public T data { get; set; } + } } diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index ff67b9c1f..23d51c9f5 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Common.Internal</id> - <version>3.0.500</version> + <version>3.0.501</version> <title>MediaBrowser.Common.Internal</title> <authors>Luke</authors> <owners>ebr,Luke,scottisafool</owners> @@ -12,7 +12,7 @@ <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description> <copyright>Copyright © Media Browser 2013</copyright> <dependencies> - <dependency id="MediaBrowser.Common" version="3.0.500" /> + <dependency id="MediaBrowser.Common" version="3.0.501" /> <dependency id="NLog" version="3.1.0.0" /> <dependency id="SimpleInjector" version="2.6.0" /> <dependency id="sharpcompress" version="0.10.2" /> diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 1c7e36e81..41a81d816 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Common</id> - <version>3.0.500</version> + <version>3.0.501</version> <title>MediaBrowser.Common</title> <authors>Media Browser Team</authors> <owners>ebr,Luke,scottisafool</owners> diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec index 845fb5c4e..afd9c64a7 100644 --- a/Nuget/MediaBrowser.Model.Signed.nuspec +++ b/Nuget/MediaBrowser.Model.Signed.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Model.Signed</id> - <version>3.0.500</version> + <version>3.0.501</version> <title>MediaBrowser.Model - Signed Edition</title> <authors>Media Browser Team</authors> <owners>ebr,Luke,scottisafool</owners> diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index 491c7263e..5e9b013d0 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata> <id>MediaBrowser.Server.Core</id> - <version>3.0.500</version> + <version>3.0.501</version> <title>Media Browser.Server.Core</title> <authors>Media Browser Team</authors> <owners>ebr,Luke,scottisafool</owners> @@ -12,7 +12,7 @@ <description>Contains core components required to build plugins for Media Browser Server.</description> <copyright>Copyright © Media Browser 2013</copyright> <dependencies> - <dependency id="MediaBrowser.Common" version="3.0.500" /> + <dependency id="MediaBrowser.Common" version="3.0.501" /> </dependencies> </metadata> <files> |