Refactorings

luberda-molinet · Mar 22, 2018 · 4755c62 · 4755c62
1 parent 3d9263c
commit 4755c62
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/source/FFImageLoading.Droid/Targets/ImageViewTarget.cs b/source/FFImageLoading.Droid/Targets/ImageViewTarget.cs
@@ -56,18 +56,25 @@ public override void Set(IImageLoaderTask task, SelfDisposingBitmapDrawable imag
 
         bool IsLayoutNeeded(Drawable oldImage, Drawable newImage)
         {
-            if (oldImage == null && newImage == null)
-                return false;
+            try
+            {
+                if (oldImage == null && newImage == null)
+                    return false;
 
-            if (oldImage == null && newImage != null)
-                return true;
+                if (oldImage == null && newImage != null)
+                    return true;
 
-            if (oldImage != null && newImage == null)
-                return true;
+                if (oldImage != null && newImage == null)
+                    return true;
 
-            if (oldImage != null && newImage != null)
+                if (oldImage != null && newImage != null)
+                {
+                    return !(oldImage.IntrinsicWidth == newImage.IntrinsicWidth && oldImage.IntrinsicHeight == newImage.IntrinsicHeight);
+                }
+            }
+            catch (Exception)
             {
-                return !(oldImage.IntrinsicWidth == newImage.IntrinsicWidth && oldImage.IntrinsicHeight == newImage.IntrinsicHeight);
+                return true;
             }
 
             return false;

diff --git a/source/FFImageLoading.Touch/Targets/UIImageViewTarget.cs b/source/FFImageLoading.Touch/Targets/UIImageViewTarget.cs
@@ -58,18 +58,25 @@ public override void Set(IImageLoaderTask task, UIImage image, bool animated)
 
         bool IsLayoutNeeded(UIImage oldImage, UIImage newImage)
         {
-            if (oldImage == null && newImage == null)
-                return false;
+            try
+            {
+                if (oldImage == null && newImage == null)
+                    return false;
 
-            if (oldImage == null && newImage != null)
-                return true;
+                if (oldImage == null && newImage != null)
+                    return true;
 
-            if (oldImage != null && newImage == null)
-                return true;
+                if (oldImage != null && newImage == null)
+                    return true;
 
-            if (oldImage != null && newImage != null)
+                if (oldImage != null && newImage != null)
+                {
+                    return !(oldImage.Size.Width == newImage.Size.Width && oldImage.Size.Height == newImage.Size.Height);
+                }
+            }
+            catch (Exception)
             {
-                return !(oldImage.Size.Width == newImage.Size.Width && oldImage.Size.Height == newImage.Size.Height);
+                return true;
             }
 
             return false;