5/28 (PDT, UTC-7) に追加予定の extended_entities に対応

[opentween/open-tween.git] / OpenTween / UserInfoDialog.cs

diff --git a/OpenTween/UserInfoDialog.cs b/OpenTween/UserInfoDialog.cs
index 078f518..3e4525a 100644 (file)
--- a/OpenTween/UserInfoDialog.cs
+++ b/OpenTween/UserInfoDialog.cs
@@ -172,6 +172,11 @@ namespace OpenTween
                 oldImage.Dispose();
             }
 
+            // ProfileImageUrlHttps が null になる場合があるらしい
+            // 参照: https://sourceforge.jp/ticket/browse.php?group_id=6526&tid=33871
+            if (imageUri == null)
+                return;
+
             using (var http = MyCommon.CreateHttpClient())
             {
                 var imageStream = await http.GetStreamAsync(imageUri.Replace("_normal", "_bigger"));
@@ -197,13 +202,13 @@ namespace OpenTween
             }
         }
 
-        private async Task SetRecentStatusAsync(TwitterDataModel.Status status)
+        private async Task SetRecentStatusAsync(TwitterStatus status)
         {
             var atlist = new List<string>();
 
             if (status != null)
             {
-                var html = await this.Twitter.CreateHtmlAnchorAsync(status.Text, atlist, status.Entities, null);
+                var html = await this.Twitter.CreateHtmlAnchorAsync(status.Text, atlist, status.MergedEntities, null);
                 html = this.Owner.createDetailHtml(html +
                     " Posted at " + MyCommon.DateTimeParse(status.CreatedAt) +
                     " via " + status.Source);