浏览代码

add more sync indicators

Luke Pulverenti 10 年之前
父节点
当前提交
5c5d7d034b
共有 2 个文件被更改,包括 20 次插入10 次删除
  1. 10 2
      MediaBrowser.Api/Images/ImageService.cs
  2. 10 8
      MediaBrowser.Server.Implementations/Connect/ConnectManager.cs

+ 10 - 2
MediaBrowser.Api/Images/ImageService.cs

@@ -675,10 +675,18 @@ namespace MediaBrowser.Api.Images
 
         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;
+
+            if (userAgent.IndexOf("crosswalk", StringComparison.OrdinalIgnoreCase) != -1 &&
+                userAgent.IndexOf("android", StringComparison.OrdinalIgnoreCase) != -1)
             {
-                var userAgent = Request.UserAgent ?? string.Empty;
+                supportsWebP = true;
+            }
 
+            if (supportsWebP)
+            {
                 // Not displaying properly on iOS
                 if (userAgent.IndexOf("cfnetwork", StringComparison.OrdinalIgnoreCase) == -1)
                 {

+ 10 - 8
MediaBrowser.Server.Implementations/Connect/ConnectManager.cs

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