diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-01-02 13:15:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-02 13:15:11 -0500 |
| commit | 0cafd7dfefe07bf8e1d997c384561707e1b22c6a (patch) | |
| tree | ee8cccc0198c35879319e6a5507a007da9f5c8e6 | |
| parent | 8e7a88335d7c6ce4a13328e52de0b549ed3ad788 (diff) | |
| parent | 1d6987c7131c36fa50c8f85ab140038b71eaf83c (diff) | |
Merge pull request #361 from cvium/fix_userid_type
DeviceQuery: change UserId to GUID
| -rw-r--r-- | Emby.Server.Implementations/Devices/DeviceManager.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/Devices/DeviceQuery.cs | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs index 250316211..82df96d8b 100644 --- a/Emby.Server.Implementations/Devices/DeviceManager.cs +++ b/Emby.Server.Implementations/Devices/DeviceManager.cs @@ -145,7 +145,8 @@ namespace Emby.Server.Implementations.Devices HasUser = true }).Items; - + + // TODO: DeviceQuery doesn't seem to be used from client. Not even Swagger. if (query.SupportsSync.HasValue) { var val = query.SupportsSync.Value; diff --git a/MediaBrowser.Model/Devices/DeviceQuery.cs b/MediaBrowser.Model/Devices/DeviceQuery.cs index 9ceea1ea8..fa2e11d4d 100644 --- a/MediaBrowser.Model/Devices/DeviceQuery.cs +++ b/MediaBrowser.Model/Devices/DeviceQuery.cs @@ -1,4 +1,6 @@ +using System; + namespace MediaBrowser.Model.Devices { public class DeviceQuery @@ -17,6 +19,6 @@ namespace MediaBrowser.Model.Devices /// Gets or sets the user identifier. /// </summary> /// <value>The user identifier.</value> - public string UserId { get; set; } + public Guid UserId { get; set; } } } |