Enable nullable in more files

Emby.Dlna/Configuration/DlnaOptions.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 #pragma warning disable CS1591
 
 namespace Emby.Dlna.Configuration
@@ -74,7 +72,7 @@ namespace Emby.Dlna.Configuration
         /// <summary>
         /// Gets or sets the default user account that the dlna server uses.
         /// </summary>
-        public string DefaultUserId { get; set; }
+        public string? DefaultUserId { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether playTo device profiles should be created.

Emby.Dlna/ContentDirectory/ContentDirectoryService.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 #pragma warning disable CS1591
 
 using System;
@@ -140,7 +138,7 @@ namespace Emby.Dlna.ContentDirectory
         /// </summary>
         /// <param name="profile">The <see cref="DeviceProfile"/>.</param>
         /// <returns>The <see cref="User"/>.</returns>
-        private User GetUser(DeviceProfile profile)
+        private User? GetUser(DeviceProfile profile)
         {
             if (!string.IsNullOrEmpty(profile.UserId))
             {

Emby.Dlna/ControlResponse.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 #pragma warning disable CS1591
 
 using System.Collections.Generic;
@@ -8,9 +6,11 @@ namespace Emby.Dlna
 {
     public class ControlResponse
     {
-        public ControlResponse()
+        public ControlResponse(string xml, bool isSuccessful)
         {
             Headers = new Dictionary<string, string>();
+            Xml = xml;
+            IsSuccessful = isSuccessful;
         }
 
         public IDictionary<string, string> Headers { get; }

Emby.Dlna/EventSubscriptionResponse.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 #pragma warning disable CS1591
 
 using System.Collections.Generic;
@@ -8,8 +6,10 @@ namespace Emby.Dlna
 {
     public class EventSubscriptionResponse
     {
-        public EventSubscriptionResponse()
+        public EventSubscriptionResponse(string content, string contentType)
         {
+            Content = content;
+            ContentType = contentType;
             Headers = new Dictionary<string, string>();
         }
 

Emby.Dlna/Eventing/DlnaEventManager.cs

@@ -51,11 +51,7 @@ namespace Emby.Dlna.Eventing
                 return GetEventSubscriptionResponse(subscriptionId, requestedTimeoutString, timeoutSeconds);
             }
 
-            return new EventSubscriptionResponse
+            return new EventSubscriptionResponse(string.Empty, "text/plain");
-            {
-                Content = string.Empty,
-                ContentType = "text/plain"
-            };
         }
 
         public EventSubscriptionResponse CreateEventSubscription(string notificationType, string requestedTimeoutString, string callbackUrl)
@@ -103,20 +99,12 @@ namespace Emby.Dlna.Eventing
 
             _subscriptions.TryRemove(subscriptionId, out _);
 
-            return new EventSubscriptionResponse
+            return new EventSubscriptionResponse(string.Empty, "text/plain");
-            {
-                Content = string.Empty,
-                ContentType = "text/plain"
-            };
         }
 
         private EventSubscriptionResponse GetEventSubscriptionResponse(string subscriptionId, string requestedTimeoutString, int timeoutSeconds)
         {
-            var response = new EventSubscriptionResponse
+            var response = new EventSubscriptionResponse(string.Empty, "text/plain");
-            {
-                Content = string.Empty,
-                ContentType = "text/plain"
-            };
 
             response.Headers["SID"] = subscriptionId;
             response.Headers["TIMEOUT"] = string.IsNullOrEmpty(requestedTimeoutString) ? ("SECOND-" + timeoutSeconds.ToString(_usCulture)) : requestedTimeoutString;

Emby.Dlna/PlayTo/Device.cs

@@ -1260,10 +1260,7 @@ namespace Emby.Dlna.PlayTo
                 return;
             }
 
-            PlaybackStart?.Invoke(this, new PlaybackStartEventArgs
+            PlaybackStart?.Invoke(this, new PlaybackStartEventArgs(mediaInfo));
-            {
-                MediaInfo = mediaInfo
-            });
         }
 
         private void OnPlaybackProgress(UBaseObject mediaInfo)
@@ -1273,27 +1270,17 @@ namespace Emby.Dlna.PlayTo
                 return;
             }
 
-            PlaybackProgress?.Invoke(this, new PlaybackProgressEventArgs
+            PlaybackProgress?.Invoke(this, new PlaybackProgressEventArgs(mediaInfo));
-            {
-                MediaInfo = mediaInfo
-            });
         }
 
         private void OnPlaybackStop(UBaseObject mediaInfo)
         {
-            PlaybackStopped?.Invoke(this, new PlaybackStoppedEventArgs
+            PlaybackStopped?.Invoke(this, new PlaybackStoppedEventArgs(mediaInfo));
-            {
-                MediaInfo = mediaInfo
-            });
         }
 
         private void OnMediaChanged(UBaseObject old, UBaseObject newMedia)
         {
-            MediaChanged?.Invoke(this, new MediaChangedEventArgs
+            MediaChanged?.Invoke(this, new MediaChangedEventArgs(old, newMedia));
-            {
-                OldMediaInfo = old,
-                NewMediaInfo = newMedia
-            });
         }
 
         /// <inheritdoc />

Emby.Dlna/PlayTo/MediaChangedEventArgs.cs

@@ -1,6 +1,4 @@
-#nullable disable
+#pragma warning disable CS1591
-
-#pragma warning disable CS1591
 
 using System;
 
@@ -8,6 +6,12 @@ namespace Emby.Dlna.PlayTo
 {
     public class MediaChangedEventArgs : EventArgs
     {
+        public MediaChangedEventArgs(UBaseObject oldMediaInfo, UBaseObject newMediaInfo)
+        {
+            OldMediaInfo = oldMediaInfo;
+            NewMediaInfo = newMediaInfo;
+        }
+
         public UBaseObject OldMediaInfo { get; set; }
 
         public UBaseObject NewMediaInfo { get; set; }

Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 #pragma warning disable CS1591
 
 using System;
@@ -8,6 +6,11 @@ namespace Emby.Dlna.PlayTo
 {
     public class PlaybackProgressEventArgs : EventArgs
     {
+        public PlaybackProgressEventArgs(UBaseObject mediaInfo)
+        {
+            MediaInfo = mediaInfo;
+        }
+
         public UBaseObject MediaInfo { get; set; }
     }
 }

Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 #pragma warning disable CS1591
 
 using System;
@@ -8,6 +6,11 @@ namespace Emby.Dlna.PlayTo
 {
     public class PlaybackStartEventArgs : EventArgs
     {
+        public PlaybackStartEventArgs(UBaseObject mediaInfo)
+        {
+            MediaInfo = mediaInfo;
+        }
+
         public UBaseObject MediaInfo { get; set; }
     }
 }

Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 #pragma warning disable CS1591
 
 using System;
@@ -8,6 +6,11 @@ namespace Emby.Dlna.PlayTo
 {
     public class PlaybackStoppedEventArgs : EventArgs
     {
+        public PlaybackStoppedEventArgs(UBaseObject mediaInfo)
+        {
+            MediaInfo = mediaInfo;
+        }
+
         public UBaseObject MediaInfo { get; set; }
     }
 }

Emby.Dlna/Service/BaseControlHandler.cs

@@ -95,11 +95,7 @@ namespace Emby.Dlna.Service
 
             var xml = builder.ToString().Replace("xmlns:m=", "xmlns:u=", StringComparison.Ordinal);
 
-            var controlResponse = new ControlResponse
+            var controlResponse = new ControlResponse(xml, true);
-            {
-                Xml = xml,
-                IsSuccessful = true
-            };
 
             controlResponse.Headers.Add("EXT", string.Empty);
 

Emby.Dlna/Service/ControlErrorHandler.cs

@@ -46,11 +46,7 @@ namespace Emby.Dlna.Service
                 writer.WriteEndDocument();
             }
 
-            return new ControlResponse
+            return new ControlResponse(builder.ToString(), false);
-            {
-                Xml = builder.ToString(),
-                IsSuccessful = false
-            };
         }
     }
 }

Jellyfin.Server.Implementations/Activity/ActivityManager.cs

@@ -86,15 +86,12 @@ namespace Jellyfin.Server.Implementations.Activity
 
         private static ActivityLogEntry ConvertToOldModel(ActivityLog entry)
         {
-            return new ActivityLogEntry
+            return new ActivityLogEntry(entry.Name, entry.Type, entry.UserId)
             {
                 Id = entry.Id,
-                Name = entry.Name,
                 Overview = entry.Overview,
                 ShortOverview = entry.ShortOverview,
-                Type = entry.Type,
                 ItemId = entry.ItemId,
-                UserId = entry.UserId,
                 Date = entry.DateCreated,
                 Severity = entry.LogSeverity
             };

MediaBrowser.Model/Activity/ActivityLogEntry.cs

@@ -1,13 +1,26 @@
-#nullable disable
-#pragma warning disable CS1591
-
 using System;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Model.Activity
 {
+    /// <summary>
+    /// An activity log entry.
+    /// </summary>
     public class ActivityLogEntry
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActivityLogEntry"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="type">The type.</param>
+        /// <param name="userId">The user id.</param>
+        public ActivityLogEntry(string name, string type, Guid userId)
+        {
+            Name = name;
+            Type = type;
+            UserId = userId;
+        }
+
         /// <summary>
         /// Gets or sets the identifier.
         /// </summary>
@@ -24,13 +37,13 @@ namespace MediaBrowser.Model.Activity
         /// Gets or sets the overview.
         /// </summary>
         /// <value>The overview.</value>
-        public string Overview { get; set; }
+        public string? Overview { get; set; }
 
         /// <summary>
         /// Gets or sets the short overview.
         /// </summary>
         /// <value>The short overview.</value>
-        public string ShortOverview { get; set; }
+        public string? ShortOverview { get; set; }
 
         /// <summary>
         /// Gets or sets the type.
@@ -42,7 +55,7 @@ namespace MediaBrowser.Model.Activity
         /// Gets or sets the item identifier.
         /// </summary>
         /// <value>The item identifier.</value>
-        public string ItemId { get; set; }
+        public string? ItemId { get; set; }
 
         /// <summary>
         /// Gets or sets the date.
@@ -61,7 +74,7 @@ namespace MediaBrowser.Model.Activity
         /// </summary>
         /// <value>The user primary image tag.</value>
         [Obsolete("UserPrimaryImageTag is not used.")]
-        public string UserPrimaryImageTag { get; set; }
+        public string? UserPrimaryImageTag { get; set; }
 
         /// <summary>
         /// Gets or sets the log severity.

MediaBrowser.Model/Branding/BrandingOptions.cs

@@ -1,4 +1,3 @@
-#nullable disable
 #pragma warning disable CS1591
 
 namespace MediaBrowser.Model.Branding
@@ -9,12 +8,12 @@ namespace MediaBrowser.Model.Branding
         /// Gets or sets the login disclaimer.
         /// </summary>
         /// <value>The login disclaimer.</value>
-        public string LoginDisclaimer { get; set; }
+        public string? LoginDisclaimer { get; set; }
 
         /// <summary>
         /// Gets or sets the custom CSS.
         /// </summary>
         /// <value>The custom CSS.</value>
-        public string CustomCss { get; set; }
+        public string? CustomCss { get; set; }
     }
 }

MediaBrowser.Model/Channels/ChannelInfo.cs

@@ -1,32 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Model.Channels
-{
-    public class ChannelInfo
-    {
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the identifier.
-        /// </summary>
-        /// <value>The identifier.</value>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the home page URL.
-        /// </summary>
-        /// <value>The home page URL.</value>
-        public string HomePageUrl { get; set; }
-
-        /// <summary>
-        /// Gets or sets the features.
-        /// </summary>
-        /// <value>The features.</value>
-        public ChannelFeatures Features { get; set; }
-    }
-}