aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Net
diff options
context:
space:
mode:
authorLogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>2019-01-05 16:22:18 -0800
committerGitHub <noreply@github.com>2019-01-05 16:22:18 -0800
commit8ff89fdc0c30f595a171ffc550f907ef22b6212a (patch)
tree6bae45c12ea8530e5af2ceaceaa50e715ea7087c /MediaBrowser.Controller/Net
parent4eaeee7be24a35e697731da1403c12df8f4f753a (diff)
parentb39585cbf6ccc519161e8f6420daaa046a26bf32 (diff)
Merge pull request #5 from jellyfin/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Net')
-rw-r--r--MediaBrowser.Controller/Net/AuthorizationInfo.cs8
-rw-r--r--MediaBrowser.Controller/Net/WebSocketConnectEventArgs.cs2
2 files changed, 1 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Net/AuthorizationInfo.cs b/MediaBrowser.Controller/Net/AuthorizationInfo.cs
index a68060db5..848d8fa15 100644
--- a/MediaBrowser.Controller/Net/AuthorizationInfo.cs
+++ b/MediaBrowser.Controller/Net/AuthorizationInfo.cs
@@ -1,7 +1,6 @@
using MediaBrowser.Controller.Entities;
using System;
-
namespace MediaBrowser.Controller.Net
{
public class AuthorizationInfo
@@ -12,12 +11,7 @@ namespace MediaBrowser.Controller.Net
/// <value>The user identifier.</value>
public Guid UserId {
get {
- if (User == null) {
- return Guid.Empty;
- }
- else {
- return User.Id;
- }
+ return User == null ? Guid.Empty : User.Id;
}
}
diff --git a/MediaBrowser.Controller/Net/WebSocketConnectEventArgs.cs b/MediaBrowser.Controller/Net/WebSocketConnectEventArgs.cs
index b200f883a..26abbc2d2 100644
--- a/MediaBrowser.Controller/Net/WebSocketConnectEventArgs.cs
+++ b/MediaBrowser.Controller/Net/WebSocketConnectEventArgs.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Specialized;
using MediaBrowser.Model.Services;
namespace MediaBrowser.Controller.Net
@@ -7,7 +6,6 @@ namespace MediaBrowser.Controller.Net
/// <summary>
/// Class WebSocketConnectEventArgs
/// </summary>
-
public class WebSocketConnectingEventArgs : EventArgs
{
/// <summary>