diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations/Devices')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Devices/DeviceManager.cs | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs index 9479335614..3dfc04c267 100644 --- a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs +++ b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs @@ -28,6 +28,7 @@ namespace MediaBrowser.Server.Implementations.Devices return base.IsVisible(user) && HasChildren(); } + [IgnoreDataMember] public override string CollectionType { get { return Model.Entities.CollectionType.Photos; } diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs index 6b1af8d2d9..c3db9140cf 100644 --- a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs +++ b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs @@ -51,6 +51,11 @@ namespace MediaBrowser.Server.Implementations.Devices public async Task<DeviceInfo> RegisterDevice(string reportedId, string name, string appName, string appVersion, string usedByUserId) { + if (string.IsNullOrWhiteSpace(reportedId)) + { + throw new ArgumentNullException("reportedId"); + } + var device = GetDevice(reportedId) ?? new DeviceInfo { Id = reportedId |