diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-10-29 21:17:31 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-10-29 21:17:31 -0400 |
| commit | b1c9b224c49b28aa18785ad8c773314456b1da72 (patch) | |
| tree | 8f976366a5795c9379988c5e265c2479ac2506be /MediaBrowser.Model/ApiClient | |
| parent | 45a01563e85abf9ed5005d66105fb1be1cc56a16 (diff) | |
add server id to dto's
Diffstat (limited to 'MediaBrowser.Model/ApiClient')
| -rw-r--r-- | MediaBrowser.Model/ApiClient/ServerCredentials.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/ApiClient/ServerInfo.cs | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/MediaBrowser.Model/ApiClient/ServerCredentials.cs b/MediaBrowser.Model/ApiClient/ServerCredentials.cs index 4999062948..56bf5cc185 100644 --- a/MediaBrowser.Model/ApiClient/ServerCredentials.cs +++ b/MediaBrowser.Model/ApiClient/ServerCredentials.cs @@ -35,6 +35,8 @@ namespace MediaBrowser.Model.ApiClient // Merge the data existing.DateLastAccessed = new[] { existing.DateLastAccessed, server.DateLastAccessed }.Max(); + existing.UserLinkType = server.UserLinkType; + if (!string.IsNullOrEmpty(server.AccessToken)) { existing.AccessToken = server.AccessToken; diff --git a/MediaBrowser.Model/ApiClient/ServerInfo.cs b/MediaBrowser.Model/ApiClient/ServerInfo.cs index 299e3015c4..0570647e9b 100644 --- a/MediaBrowser.Model/ApiClient/ServerInfo.cs +++ b/MediaBrowser.Model/ApiClient/ServerInfo.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Model.System; +using MediaBrowser.Model.Connect; +using MediaBrowser.Model.System; using System; using System.Collections.Generic; @@ -15,6 +16,7 @@ namespace MediaBrowser.Model.ApiClient public List<WakeOnLanInfo> WakeOnLanInfos { get; set; } public DateTime DateLastAccessed { get; set; } public String ExchangeToken { get; set; } + public UserLinkType? UserLinkType { get; set; } public ServerInfo() { |
