diff options
| author | LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com> | 2019-01-05 16:22:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-05 16:22:18 -0800 |
| commit | 8ff89fdc0c30f595a171ffc550f907ef22b6212a (patch) | |
| tree | 6bae45c12ea8530e5af2ceaceaa50e715ea7087c /MediaBrowser.Controller/Session | |
| parent | 4eaeee7be24a35e697731da1403c12df8f4f753a (diff) | |
| parent | b39585cbf6ccc519161e8f6420daaa046a26bf32 (diff) | |
Merge pull request #5 from jellyfin/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Session')
| -rw-r--r-- | MediaBrowser.Controller/Session/AuthenticationRequest.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Session/ISessionManager.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Session/SessionInfo.cs | 8 |
3 files changed, 4 insertions, 7 deletions
diff --git a/MediaBrowser.Controller/Session/AuthenticationRequest.cs b/MediaBrowser.Controller/Session/AuthenticationRequest.cs index eb64db8c3..0489cf9b6 100644 --- a/MediaBrowser.Controller/Session/AuthenticationRequest.cs +++ b/MediaBrowser.Controller/Session/AuthenticationRequest.cs @@ -1,6 +1,5 @@ using System; - namespace MediaBrowser.Controller.Session { public class AuthenticationRequest @@ -9,7 +8,6 @@ namespace MediaBrowser.Controller.Session public Guid UserId { get; set; } public string Password { get; set; } public string PasswordSha1 { get; set; } - public string PasswordMd5 { get; set; } public string App { get; set; } public string AppVersion { get; set; } public string DeviceId { get; set; } diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs index b7719e556..eca345cbc 100644 --- a/MediaBrowser.Controller/Session/ISessionManager.cs +++ b/MediaBrowser.Controller/Session/ISessionManager.cs @@ -5,7 +5,6 @@ using MediaBrowser.Controller.Security; using MediaBrowser.Model.Dto; using MediaBrowser.Model.Events; using MediaBrowser.Model.Session; -using MediaBrowser.Model.Users; using System; using System.Collections.Generic; using System.Threading; diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs index 98848a440..77e786ead 100644 --- a/MediaBrowser.Controller/Session/SessionInfo.cs +++ b/MediaBrowser.Controller/Session/SessionInfo.cs @@ -22,9 +22,9 @@ namespace MediaBrowser.Controller.Session _sessionManager = sessionManager; _logger = logger; - AdditionalUsers = new SessionUserInfo[] { }; + AdditionalUsers = Array.Empty<SessionUserInfo>(); PlayState = new PlayerStateInfo(); - SessionControllers = new ISessionController[] { }; + SessionControllers = Array.Empty<ISessionController>(); } public PlayerStateInfo PlayState { get; set; } @@ -49,7 +49,7 @@ namespace MediaBrowser.Controller.Session { if (Capabilities == null) { - return new string[] {}; + return Array.Empty<string>(); } return Capabilities.PlayableMediaTypes; } @@ -363,7 +363,7 @@ namespace MediaBrowser.Controller.Session StopAutomaticProgress(); var controllers = SessionControllers.ToList(); - SessionControllers = new ISessionController[] { }; + SessionControllers = Array.Empty<ISessionController>(); foreach (var controller in controllers) { |
