Merge branch 'master' into erroronwarn

Emby.Server.Implementations/Library/LibraryManager.cs

@@ -144,6 +144,7 @@ namespace Emby.Server.Implementations.Library
         /// <param name="userviewManagerFactory">The userview manager.</param>
         /// <param name="mediaEncoder">The media encoder.</param>
         /// <param name="itemRepository">The item repository.</param>
+        /// <param name="imageProcessor">The image processor.</param>
         public LibraryManager(
             IServerApplicationHost appHost,
             ILogger<LibraryManager> logger,

MediaBrowser.Api/Devices/DeviceService.cs

@@ -1,4 +1,3 @@
-using System.IO;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Net;
@@ -40,33 +39,6 @@ namespace MediaBrowser.Api.Devices
         public string Id { get; set; }
     }
 
-    [Route("/Devices/CameraUploads", "GET", Summary = "Gets camera upload history for a device")]
-    [Authenticated]
-    public class GetCameraUploads : IReturn<ContentUploadHistory>
-    {
-        [ApiMember(Name = "Id", Description = "Device Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public string DeviceId { get; set; }
-    }
-
-    [Route("/Devices/CameraUploads", "POST", Summary = "Uploads content")]
-    [Authenticated]
-    public class PostCameraUpload : IRequiresRequestStream, IReturnVoid
-    {
-        [ApiMember(Name = "DeviceId", Description = "Device Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string DeviceId { get; set; }
-
-        [ApiMember(Name = "Album", Description = "Album", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Album { get; set; }
-
-        [ApiMember(Name = "Name", Description = "Name", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Name { get; set; }
-
-        [ApiMember(Name = "Id", Description = "Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Id { get; set; }
-
-        public Stream RequestStream { get; set; }
-    }
-
     [Route("/Devices/Options", "POST", Summary = "Updates device options")]
     [Authenticated(Roles = "Admin")]
     public class PostDeviceOptions : DeviceOptions, IReturnVoid

MediaBrowser.Controller/Devices/CameraImageUploadInfo.cs

@@ -1,10 +0,0 @@
-using MediaBrowser.Model.Devices;
-
-namespace MediaBrowser.Controller.Devices
-{
-    public class CameraImageUploadInfo
-    {
-        public LocalFileInfo FileInfo { get; set; }
-        public DeviceInfo Device { get; set; }
-    }
-}

MediaBrowser.Model/Devices/ContentUploadHistory.cs

@@ -1,19 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-using System;
-
-namespace MediaBrowser.Model.Devices
-{
-    public class ContentUploadHistory
-    {
-        public string DeviceId { get; set; }
-
-        public LocalFileInfo[] FilesUploaded { get; set; }
-
-        public ContentUploadHistory()
-        {
-            FilesUploaded = Array.Empty<LocalFileInfo>();
-        }
-    }
-}

MediaBrowser.Model/Devices/DeviceOptions.cs

@@ -4,6 +4,6 @@ namespace MediaBrowser.Model.Devices
 {
     public class DeviceOptions
     {
-        public string CustomName { get; set; }
+        public string? CustomName { get; set; }
     }
 }

MediaBrowser.Model/Devices/LocalFileInfo.cs

@@ -1,16 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Model.Devices
-{
-    public class LocalFileInfo
-    {
-        public string Name { get; set; }
-
-        public string Id { get; set; }
-
-        public string Album { get; set; }
-
-        public string MimeType { get; set; }
-    }
-}

MediaBrowser.Model/SyncPlay/GroupInfoView.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace MediaBrowser.Model.SyncPlay

MediaBrowser.Model/SyncPlay/GroupUpdate.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace MediaBrowser.Model.SyncPlay
 {
     /// <summary>

MediaBrowser.Model/SyncPlay/SendCommand.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace MediaBrowser.Model.SyncPlay
 {
     /// <summary>

MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace MediaBrowser.Model.SyncPlay
 {
     /// <summary>

MediaBrowser.Model/Updates/VersionInfo.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace MediaBrowser.Model.Updates