2 files changed, 21 insertions, 20 deletions
diff --git a/MediaBrowser.Api/Sessions/SessionInfoWebSocketListener.cs b/MediaBrowser.Api/Sessions/SessionInfoWebSocketListener.cs
index 0e74c9267..2400d6def 100644
--- a/MediaBrowser.Api/Sessions/SessionInfoWebSocketListener.cs
+++ b/MediaBrowser.Api/Sessions/SessionInfoWebSocketListener.cs
@@ -8,7 +8,7 @@ using Microsoft.Extensions.Logging;
 namespace MediaBrowser.Api.Sessions
 {
     /// <summary>
-    /// Class SessionInfoWebSocketListener
+    /// Class SessionInfoWebSocketListener.
     /// </summary>
     public class SessionInfoWebSocketListener : BasePeriodicWebSocketListener<IEnumerable<SessionInfo>, WebSocketListenerState>
     {
@@ -19,7 +19,7 @@ namespace MediaBrowser.Api.Sessions
         protected override string Name => "Sessions";
 
         /// <summary>
-        /// The _kernel
+        /// The _kernel.
         /// </summary>
         private readonly ISessionManager _sessionManager;
 
@@ -40,39 +40,39 @@ namespace MediaBrowser.Api.Sessions
             _sessionManager.SessionActivity += OnSessionManagerSessionActivity;
         }
 
-        private void OnSessionManagerSessionActivity(object sender, SessionEventArgs e)
+        private async void OnSessionManagerSessionActivity(object sender, SessionEventArgs e)
         {
-            SendData(false);
+            await SendData(false).ConfigureAwait(false);
         }
 
-        private void OnSessionManagerCapabilitiesChanged(object sender, SessionEventArgs e)
+        private async void OnSessionManagerCapabilitiesChanged(object sender, SessionEventArgs e)
         {
-            SendData(true);
+            await SendData(true).ConfigureAwait(false);
         }
 
-        private void OnSessionManagerPlaybackProgress(object sender, PlaybackProgressEventArgs e)
+        private async void OnSessionManagerPlaybackProgress(object sender, PlaybackProgressEventArgs e)
         {
-            SendData(!e.IsAutomated);
+            await SendData(!e.IsAutomated).ConfigureAwait(false);
         }
 
-        private void OnSessionManagerPlaybackStopped(object sender, PlaybackStopEventArgs e)
+        private async void OnSessionManagerPlaybackStopped(object sender, PlaybackStopEventArgs e)
         {
-            SendData(true);
+            await SendData(true).ConfigureAwait(false);
         }
 
-        private void OnSessionManagerPlaybackStart(object sender, PlaybackProgressEventArgs e)
+        private async void OnSessionManagerPlaybackStart(object sender, PlaybackProgressEventArgs e)
         {
-            SendData(true);
+            await SendData(true).ConfigureAwait(false);
         }
 
-        private void OnSessionManagerSessionEnded(object sender, SessionEventArgs e)
+        private async void OnSessionManagerSessionEnded(object sender, SessionEventArgs e)
         {
-            SendData(true);
+            await SendData(true).ConfigureAwait(false);
         }
 
-        private void OnSessionManagerSessionStarted(object sender, SessionEventArgs e)
+        private async void OnSessionManagerSessionStarted(object sender, SessionEventArgs e)
         {
-            SendData(true);
+            await SendData(true).ConfigureAwait(false);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Api/Sessions/SessionService.cs b/MediaBrowser.Api/Sessions/SessionService.cs
index 020bb5042..50adc5698 100644
--- a/MediaBrowser.Api/Sessions/SessionService.cs
+++ b/MediaBrowser.Api/Sessions/SessionService.cs
@@ -2,6 +2,7 @@ using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Library;
@@ -45,14 +46,14 @@ namespace MediaBrowser.Api.Sessions
         public string Id { get; set; }
 
         /// <summary>
-        /// Artist, Genre, Studio, Person, or any kind of BaseItem
+        /// Artist, Genre, Studio, Person, or any kind of BaseItem.
         /// </summary>
         /// <value>The type of the item.</value>
         [ApiMember(Name = "ItemType", Description = "The type of item to browse to.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
         public string ItemType { get; set; }
 
         /// <summary>
-        /// Artist name, genre name, item Id, etc
+        /// Artist name, genre name, item Id, etc.
         /// </summary>
         /// <value>The item identifier.</value>
         [ApiMember(Name = "ItemId", Description = "The Id of the item.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
@@ -326,12 +327,12 @@ namespace MediaBrowser.Api.Sessions
 
                 var user = _userManager.GetUserById(request.ControllableByUserId);
 
-                if (!user.Policy.EnableRemoteControlOfOtherUsers)
+                if (!user.HasPermission(PermissionKind.EnableRemoteControlOfOtherUsers))
                 {
                     result = result.Where(i => i.UserId.Equals(Guid.Empty) || i.ContainsUser(request.ControllableByUserId));
                 }
 
-                if (!user.Policy.EnableSharedDeviceControl)
+                if (!user.HasPermission(PermissionKind.EnableSharedDeviceControl))
                 {
                     result = result.Where(i => !i.UserId.Equals(Guid.Empty));
                 }