aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
authorVasily <JustAMan@users.noreply.github.com>2019-01-29 19:32:08 +0300
committerGitHub <noreply@github.com>2019-01-29 19:32:08 +0300
commitc8cb9080043e035834bb9a01d78c21d0f770e35f (patch)
tree04ac2b3c61fac282d260b239cae6368676782ecb /MediaBrowser.Api
parent8ab08dd041a44200786606ce737e49523e0169fd (diff)
parentded9dee22c38e443a237d738bef97bd6d4442324 (diff)
Merge pull request #716 from Bond-009/warnings
Remove more compile time warnings
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/PluginService.cs26
-rw-r--r--MediaBrowser.Api/UserLibrary/PlaystateService.cs10
2 files changed, 13 insertions, 23 deletions
diff --git a/MediaBrowser.Api/PluginService.cs b/MediaBrowser.Api/PluginService.cs
index 94be45474..af61887b2 100644
--- a/MediaBrowser.Api/PluginService.cs
+++ b/MediaBrowser.Api/PluginService.cs
@@ -153,7 +153,11 @@ namespace MediaBrowser.Api
private readonly INetworkManager _network;
private readonly IDeviceManager _deviceManager;
- public PluginService(IJsonSerializer jsonSerializer, IApplicationHost appHost, IInstallationManager installationManager, INetworkManager network, IDeviceManager deviceManager)
+ public PluginService(IJsonSerializer jsonSerializer,
+ IApplicationHost appHost,
+ IInstallationManager installationManager,
+ INetworkManager network,
+ IDeviceManager deviceManager)
: base()
{
if (jsonSerializer == null)
@@ -173,7 +177,7 @@ namespace MediaBrowser.Api
/// </summary>
/// <param name="request">The request.</param>
/// <returns>System.Object.</returns>
- public async Task<object> Get(GetRegistrationStatus request)
+ public object Get(GetRegistrationStatus request)
{
var record = new MBRegistrationRecord
{
@@ -187,26 +191,12 @@ namespace MediaBrowser.Api
return ToOptimizedResult(record);
}
- //TODO this function is only kept for compatibility and should be removed once paid plugins break
- public async Task<object> Get(GetRegistration request)
- {
- var info = new RegistrationInfo
- {
- ExpirationDate = DateTime.Now.AddYears(100),
- IsRegistered = true,
- IsTrial = false,
- Name = request.Name
- };
-
- return ToOptimizedResult(info);
- }
-
/// <summary>
/// Gets the specified request.
/// </summary>
/// <param name="request">The request.</param>
/// <returns>System.Object.</returns>
- public async Task<object> Get(GetPlugins request)
+ public object Get(GetPlugins request)
{
var result = _appHost.Plugins.OrderBy(p => p.Name).Select(p => p.GetPluginInfo()).ToArray();
return ToOptimizedResult(result);
@@ -230,7 +220,7 @@ namespace MediaBrowser.Api
/// </summary>
/// <param name="request">The request.</param>
/// <returns>System.Object.</returns>
- public async Task<object> Get(GetPluginSecurityInfo request)
+ public object Get(GetPluginSecurityInfo request)
{
var result = new PluginSecurityInfo
{
diff --git a/MediaBrowser.Api/UserLibrary/PlaystateService.cs b/MediaBrowser.Api/UserLibrary/PlaystateService.cs
index 76f91e373..72a943092 100644
--- a/MediaBrowser.Api/UserLibrary/PlaystateService.cs
+++ b/MediaBrowser.Api/UserLibrary/PlaystateService.cs
@@ -267,13 +267,13 @@ namespace MediaBrowser.Api.UserLibrary
var session = GetSession(_sessionContext);
- var dto = await UpdatePlayedStatus(user, request.Id, true, datePlayed).ConfigureAwait(false);
+ var dto = UpdatePlayedStatus(user, request.Id, true, datePlayed);
foreach (var additionalUserInfo in session.AdditionalUsers)
{
var additionalUser = _userManager.GetUserById(additionalUserInfo.UserId);
- await UpdatePlayedStatus(additionalUser, request.Id, true, datePlayed).ConfigureAwait(false);
+ UpdatePlayedStatus(additionalUser, request.Id, true, datePlayed);
}
return dto;
@@ -412,13 +412,13 @@ namespace MediaBrowser.Api.UserLibrary
var session = GetSession(_sessionContext);
- var dto = await UpdatePlayedStatus(user, request.Id, false, null).ConfigureAwait(false);
+ var dto = UpdatePlayedStatus(user, request.Id, false, null);
foreach (var additionalUserInfo in session.AdditionalUsers)
{
var additionalUser = _userManager.GetUserById(additionalUserInfo.UserId);
- await UpdatePlayedStatus(additionalUser, request.Id, false, null).ConfigureAwait(false);
+ UpdatePlayedStatus(additionalUser, request.Id, false, null);
}
return dto;
@@ -432,7 +432,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <param name="wasPlayed">if set to <c>true</c> [was played].</param>
/// <param name="datePlayed">The date played.</param>
/// <returns>Task.</returns>
- private async Task<UserItemDataDto> UpdatePlayedStatus(User user, string itemId, bool wasPlayed, DateTime? datePlayed)
+ private UserItemDataDto UpdatePlayedStatus(User user, string itemId, bool wasPlayed, DateTime? datePlayed)
{
var item = _libraryManager.GetItemById(itemId);