Merge pull request #1118 from MediaBrowser/dev

3.0.5641.4

1 files changed, 10 insertions, 2 deletions

diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 8c6cc0a18..b8ea62137 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/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)
                 {