Merge branch 'master' into segment-deletion

3 files changed, 7 insertions, 20 deletions

diff --git a/MediaBrowser.Controller/Session/ISessionController.cs b/MediaBrowser.Controller/Session/ISessionController.cs
index b38ee1146..c8b29aa1f 100644
--- a/MediaBrowser.Controller/Session/ISessionController.cs
+++ b/MediaBrowser.Controller/Session/ISessionController.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 #pragma warning disable CS1591
 
 using System;
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index b16399598..0c4719a0e 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data.Entities.Security;
-using Jellyfin.Data.Events;
 using MediaBrowser.Controller.Authentication;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Session;
@@ -58,16 +57,6 @@ namespace MediaBrowser.Controller.Session
         event EventHandler<SessionEventArgs> CapabilitiesChanged;
 
         /// <summary>
-        /// Occurs when [authentication failed].
-        /// </summary>
-        event EventHandler<GenericEventArgs<AuthenticationRequest>> AuthenticationFailed;
-
-        /// <summary>
-        /// Occurs when [authentication succeeded].
-        /// </summary>
-        event EventHandler<GenericEventArgs<AuthenticationResult>> AuthenticationSucceeded;
-
-        /// <summary>
         /// Gets the sessions.
         /// </summary>
         /// <value>The sessions.</value>
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index b4520ae48..25bf23d61 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -64,7 +64,7 @@ namespace MediaBrowser.Controller.Session
         {
             get
             {
-                if (Capabilities == null)
+                if (Capabilities is null)
                 {
                     return Array.Empty<string>();
                 }
@@ -182,7 +182,7 @@ namespace MediaBrowser.Controller.Session
         {
             get
             {
-                if (Capabilities == null || !Capabilities.SupportsMediaControl)
+                if (Capabilities is null || !Capabilities.SupportsMediaControl)
                 {
                     return false;
                 }
@@ -204,7 +204,7 @@ namespace MediaBrowser.Controller.Session
         {
             get
             {
-                if (Capabilities == null || !Capabilities.SupportsMediaControl)
+                if (Capabilities is null || !Capabilities.SupportsMediaControl)
                 {
                     return false;
                 }
@@ -239,7 +239,7 @@ namespace MediaBrowser.Controller.Session
         /// </summary>
         /// <value>The supported commands.</value>
         public IReadOnlyList<GeneralCommandType> SupportedCommands
-            => Capabilities == null ? Array.Empty<GeneralCommandType>() : Capabilities.SupportedCommands;
+            => Capabilities is null ? Array.Empty<GeneralCommandType>() : Capabilities.SupportedCommands;
 
         public Tuple<ISessionController, bool> EnsureController<T>(Func<SessionInfo, ISessionController> factory)
         {
@@ -296,7 +296,7 @@ namespace MediaBrowser.Controller.Session
             {
                 _lastProgressInfo = progressInfo;
 
-                if (_progressTimer == null)
+                if (_progressTimer is null)
                 {
                     _progressTimer = new Timer(OnProgressTimerCallback, null, 1000, 1000);
                 }
@@ -315,7 +315,7 @@ namespace MediaBrowser.Controller.Session
             }
 
             var progressInfo = _lastProgressInfo;
-            if (progressInfo == null)
+            if (progressInfo is null)
             {
                 return;
             }
@@ -357,7 +357,7 @@ namespace MediaBrowser.Controller.Session
         {
             lock (_progressLock)
             {
-                if (_progressTimer != null)
+                if (_progressTimer is not null)
                 {
                     _progressTimer.Dispose();
                     _progressTimer = null;