Merge branch 'master' into keyframe_extraction_v1

# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

3 files changed, 19 insertions, 18 deletions

diff --git a/Emby.Notifications/CoreNotificationTypes.cs b/Emby.Notifications/CoreNotificationTypes.cs
index ec3490e23..35aac3a11 100644
--- a/Emby.Notifications/CoreNotificationTypes.cs
+++ b/Emby.Notifications/CoreNotificationTypes.cs
@@ -24,63 +24,63 @@ namespace Emby.Notifications
             {
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.ApplicationUpdateInstalled.ToString()
+                     Type = nameof(NotificationType.ApplicationUpdateInstalled)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.InstallationFailed.ToString()
+                     Type = nameof(NotificationType.InstallationFailed)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.PluginInstalled.ToString()
+                     Type = nameof(NotificationType.PluginInstalled)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.PluginError.ToString()
+                     Type = nameof(NotificationType.PluginError)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.PluginUninstalled.ToString()
+                     Type = nameof(NotificationType.PluginUninstalled)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.PluginUpdateInstalled.ToString()
+                     Type = nameof(NotificationType.PluginUpdateInstalled)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.ServerRestartRequired.ToString()
+                     Type = nameof(NotificationType.ServerRestartRequired)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.TaskFailed.ToString()
+                     Type = nameof(NotificationType.TaskFailed)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.NewLibraryContent.ToString()
+                     Type = nameof(NotificationType.NewLibraryContent)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.AudioPlayback.ToString()
+                     Type = nameof(NotificationType.AudioPlayback)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.VideoPlayback.ToString()
+                     Type = nameof(NotificationType.VideoPlayback)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.AudioPlaybackStopped.ToString()
+                     Type = nameof(NotificationType.AudioPlaybackStopped)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.VideoPlaybackStopped.ToString()
+                     Type = nameof(NotificationType.VideoPlaybackStopped)
                 },
                 new NotificationTypeInfo
                 {
-                     Type = NotificationType.UserLockedOut.ToString()
+                     Type = nameof(NotificationType.UserLockedOut)
                 },
                 new NotificationTypeInfo
                 {
-                    Type = NotificationType.ApplicationUpdateAvailable.ToString()
+                    Type = nameof(NotificationType.ApplicationUpdateAvailable)
                 }
             };
 
@@ -98,7 +98,7 @@ namespace Emby.Notifications
 
         private void Update(NotificationTypeInfo note)
         {
-            note.Name = _localization.GetLocalizedString("NotificationOption" + note.Type) ?? note.Type;
+            note.Name = _localization.GetLocalizedString("NotificationOption" + note.Type);
 
             note.IsBasedOnUserEvent = note.Type.IndexOf("Playback", StringComparison.OrdinalIgnoreCase) != -1;
 
diff --git a/Emby.Notifications/Emby.Notifications.csproj b/Emby.Notifications/Emby.Notifications.csproj
index d200682e6..7fd2e9bb4 100644
--- a/Emby.Notifications/Emby.Notifications.csproj
+++ b/Emby.Notifications/Emby.Notifications.csproj
@@ -24,7 +24,7 @@
   <!-- Code analyzers-->
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.376" PrivateAssets="All" />
     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/Emby.Notifications/NotificationEntryPoint.cs b/Emby.Notifications/NotificationEntryPoint.cs
index e8ae14ff2..a56df7031 100644
--- a/Emby.Notifications/NotificationEntryPoint.cs
+++ b/Emby.Notifications/NotificationEntryPoint.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data.Events;
+using Jellyfin.Extensions;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
@@ -104,7 +105,7 @@ namespace Emby.Notifications
 
             var type = entry.Type;
 
-            if (string.IsNullOrEmpty(type) || !_coreNotificationTypes.Contains(type, StringComparer.OrdinalIgnoreCase))
+            if (string.IsNullOrEmpty(type) || !_coreNotificationTypes.Contains(type, StringComparison.OrdinalIgnoreCase))
             {
                 return;
             }