Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-09 23:30:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

add more sync indicators

Browse source
This commit is contained in:
Luke Pulverenti 2015-06-03 11:26:39 -04:00
parent 2771dd6289
commit 5c5d7d034b
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
MediaBrowser.Api/Images/ImageService.cs
View file

@ -675,10 +675,18 @@ namespace MediaBrowser.Api.Images
private ImageFormat[] GetClientSupportedFormats() private ImageFormat[] GetClientSupportedFormats()
{ {
if ((Request.AcceptTypes ?? new string[] { }).Contains("image/webp", StringComparer.OrdinalIgnoreCase)) var supportsWebP = (Request.AcceptTypes ?? new string[] {}).Contains("image/webp", StringComparer.OrdinalIgnoreCase);
{
var userAgent = Request.UserAgent ?? string.Empty;
var userAgent = Request.UserAgent ?? string.Empty;
if (userAgent.IndexOf("crosswalk", StringComparison.OrdinalIgnoreCase) != -1 &&
userAgent.IndexOf("android", StringComparison.OrdinalIgnoreCase) != -1)
{
supportsWebP = true;
}
if (supportsWebP)
{
// Not displaying properly on iOS // Not displaying properly on iOS
if (userAgent.IndexOf("cfnetwork", StringComparison.OrdinalIgnoreCase) == -1) if (userAgent.IndexOf("cfnetwork", StringComparison.OrdinalIgnoreCase) == -1)
{ {

18
MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
View file

@ -376,6 +376,11 @@ namespace MediaBrowser.Server.Implementations.Connect
public async Task<UserLinkResult> LinkUser(string userId, string connectUsername) public async Task<UserLinkResult> LinkUser(string userId, string connectUsername)
{ {
if (string.IsNullOrWhiteSpace(ConnectServerId))
{
await UpdateConnectInfo().ConfigureAwait(false);
}
await _operationLock.WaitAsync().ConfigureAwait(false); await _operationLock.WaitAsync().ConfigureAwait(false);
try try
@ -399,10 +404,6 @@ namespace MediaBrowser.Server.Implementations.Connect
throw new ArgumentNullException("connectUsername"); throw new ArgumentNullException("connectUsername");
} }
if (string.IsNullOrWhiteSpace(ConnectServerId)) if (string.IsNullOrWhiteSpace(ConnectServerId))
{
await UpdateConnectInfo().ConfigureAwait(false);
}
if (string.IsNullOrWhiteSpace(ConnectServerId))
{ {
throw new ArgumentNullException("ConnectServerId"); throw new ArgumentNullException("ConnectServerId");
} }
@ -474,6 +475,11 @@ namespace MediaBrowser.Server.Implementations.Connect
public async Task<UserLinkResult> InviteUser(ConnectAuthorizationRequest request) public async Task<UserLinkResult> InviteUser(ConnectAuthorizationRequest request)
{ {
if (string.IsNullOrWhiteSpace(ConnectServerId))
{
await UpdateConnectInfo().ConfigureAwait(false);
}
await _operationLock.WaitAsync().ConfigureAwait(false); await _operationLock.WaitAsync().ConfigureAwait(false);
try try
@ -496,10 +502,6 @@ namespace MediaBrowser.Server.Implementations.Connect
throw new ArgumentNullException("connectUsername"); throw new ArgumentNullException("connectUsername");
} }
if (string.IsNullOrWhiteSpace(ConnectServerId)) if (string.IsNullOrWhiteSpace(ConnectServerId))
{
await UpdateConnectInfo().ConfigureAwait(false);
}
if (string.IsNullOrWhiteSpace(ConnectServerId))
{ {
throw new ArgumentNullException("ConnectServerId"); throw new ArgumentNullException("ConnectServerId");
} }