Commit: 3ca44dd8a7ae4a953ccc8cff34d130cd93e4b5c3 - open_tween (git)

dev

Commit MetaInfo

• Revision: 3ca44dd8a7ae4a953ccc8cff34d130cd93e4b5c3 (tree)
• Time: 2013-11-07 00:05:43
• Author: Kimura Youichi <kim.upsilon@bucy...>
• Commiter: Kimura Youichi

Log Message

プロフィール画像の読み込みに係わる例外処理を修正

Change Summary

• modified: OpenTween/ImageCache.cs
• modified: OpenTween/ImageListViewItem.cs

Incremental Difference

--- a/OpenTween/ImageCache.cs
+++ b/OpenTween/ImageCache.cs
@@ -112,20 +112,16 @@ namespace OpenTween
                     {
                         var imageTask = client.DownloadDataAsync(new Uri(address), cancelToken).ContinueWith(t =>
                         {
-                            if (t.Exception != null)
+                            if (t.IsFaulted)
+                            {
                                 t.Exception.Handle(e => e is WebException);
+                                return null;
+                            }
 
                             if (t.Status != TaskStatus.RanToCompletion)
                                 return null;
 
-                            try
-                            {
-                                return MemoryImage.CopyFromBytes(t.Result);
-                            }
-                            catch (InvalidImageException)  // 画像形式が不正
-                            {
-                                return null;
-                            }
+                            return MemoryImage.CopyFromBytes(t.Result);
                         }, cancelToken);
 
                         this.innerDictionary[address] = imageTask;

--- a/OpenTween/ImageListViewItem.cs
+++ b/OpenTween/ImageListViewItem.cs
@@ -62,9 +62,13 @@ namespace OpenTween
         {
             return this.imageCache.DownloadImageAsync(this.imageUrl, force).ContinueWith(t =>
             {
-                var image = t.Result;
+                if (t.IsFaulted)
+                {
+                    t.Exception.Handle(x => x is InvalidImageException);
+                    return;
+                }
 
-                if (image == null) return;
+                var image = t.Result;
 
                 this._ImageReference.Target = image;
 
@@ -84,7 +88,7 @@ namespace OpenTween
                         }
                     }));
                 }
-            }, TaskContinuationOptions.OnlyOnRanToCompletion);
+            });
         }
 
         public MemoryImage Image