Remove Custom Caching Strategy from ImageEx

Too Large an Impact on App Binary Size 675kb

Author: michael-hawker

Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/CachingStrategy.cs

@@ -40,11 +40,6 @@ public partial class ImageExBase
         /// </summary>
         public static readonly DependencyProperty IsCacheEnabledProperty = DependencyProperty.Register(nameof(IsCacheEnabled), typeof(bool), typeof(ImageExBase), new PropertyMetadata(false));
 
-        /// <summary>
-        /// Identifies the <see cref="CachingStrategy"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty CachingStrategyProperty = DependencyProperty.Register(nameof(CachingStrategy), typeof(ImageExCachingStrategy), typeof(ImageExBase), new PropertyMetadata(ImageExCachingStrategy.Custom));
-
         /// <summary>
         /// Identifies the <see cref="EnableLazyLoading"/> dependency property.
         /// </summary>
@@ -126,15 +121,6 @@ public bool IsCacheEnabled
             set { SetValue(IsCacheEnabledProperty, value); }
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating how the <see cref="ImageEx"/> will be cached.
-        /// </summary>
-        public ImageExCachingStrategy CachingStrategy
-        {
-            get { return (ImageExCachingStrategy)GetValue(CachingStrategyProperty); }
-            set { SetValue(CachingStrategyProperty, value); }
-        }
-
         /// <summary>
         /// Gets or sets a value indicating whether gets or sets is lazy loading enable. (17763 or higher supported)
         /// </summary>

Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Members.cs

@@ -138,17 +138,7 @@ private async Task LoadImageAsync(Uri imageUri)
             {
                 if (IsCacheEnabled)
                 {
-                    switch (CachingStrategy)
-                    {
-                        case ImageExCachingStrategy.Custom when _isHttpSource:
-                            await SetHttpSourceCustomCached(imageUri);
-                            break;
-                        case ImageExCachingStrategy.Custom:
-                        case ImageExCachingStrategy.Internal:
-                        default:
-                            AttachSource(new BitmapImage(imageUri));
-                            break;
-                    }
+                    AttachSource(new BitmapImage(imageUri));
                 }
                 else if (string.Equals(_uri.Scheme, "data", StringComparison.OrdinalIgnoreCase))
                 {
@@ -172,57 +162,5 @@ private async Task LoadImageAsync(Uri imageUri)
                 }
             }
         }
-
-        private async Task SetHttpSourceCustomCached(Uri imageUri)
-        {
-            try
-            {
-                var propValues = new List<KeyValuePair<string, object>>();
-
-                if (DecodePixelHeight > 0)
-                {
-                    propValues.Add(new KeyValuePair<string, object>(nameof(DecodePixelHeight), DecodePixelHeight));
-                }
-
-                if (DecodePixelWidth > 0)
-                {
-                    propValues.Add(new KeyValuePair<string, object>(nameof(DecodePixelWidth), DecodePixelWidth));
-                }
-
-                if (propValues.Count > 0)
-                {
-                    propValues.Add(new KeyValuePair<string, object>(nameof(DecodePixelType), DecodePixelType));
-                }
-
-                var img = await ImageCache.Instance.GetFromCacheAsync(imageUri, true, _tokenSource.Token, propValues);
-
-                lock (LockObj)
-                {
-                    // If you have many imageEx in a virtualized ListView for instance
-                    // controls will be recycled and the uri will change while waiting for the previous one to load
-                    if (_uri == imageUri)
-                    {
-                        AttachSource(img);
-                        ImageExOpened?.Invoke(this, new ImageExOpenedEventArgs());
-                        VisualStateManager.GoToState(this, LoadedState, true);
-                    }
-                }
-            }
-            catch (OperationCanceledException)
-            {
-                // nothing to do as cancellation has been requested.
-            }
-            catch (Exception e)
-            {
-                lock (LockObj)
-                {
-                    if (_uri == imageUri)
-                    {
-                        ImageExFailed?.Invoke(this, new ImageExFailedEventArgs(e));
-                        VisualStateManager.GoToState(this, FailedState, true);
-                    }
-                }
-            }
-        }
     }
 }