From: spx Date: Sat, 10 Sep 2016 16:49:11 +0000 (+0900) Subject: CreatePostsFromSearchJsonの不要な処理を削除 X-Git-Tag: OpenTween_v1.3.6~24 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=75c410d91f4147b6135efc1c12136cf5c125f5bf;p=opentween%2Fopen-tween.git CreatePostsFromSearchJsonの不要な処理を削除 --- diff --git a/OpenTween/Twitter.cs b/OpenTween/Twitter.cs index 1a3da4ea..a60fb5e0 100644 --- a/OpenTween/Twitter.cs +++ b/OpenTween/Twitter.cs @@ -861,7 +861,7 @@ namespace OpenTween return minimumId; } - private long? CreatePostsFromSearchJson(TwitterSearchResult items, TabModel tab, bool read, int count, bool more) + private long? CreatePostsFromSearchJson(TwitterSearchResult items, PublicSearchTabModel tab, bool read, bool more) { long? minimumId = null; @@ -874,14 +874,7 @@ namespace OpenTween //二重取得回避 lock (LockObj) { - if (tab == null) - { - if (TabInformations.GetInstance().ContainsKey(status.Id)) continue; - } - else - { - if (tab.Contains(status.Id)) continue; - } + if (tab.Contains(status.Id)) continue; } var post = CreatePostsFromStatusData(status); @@ -889,11 +882,7 @@ namespace OpenTween post.IsRead = read; if ((post.IsMe && !read) && this._readOwnPost) post.IsRead = true; - //非同期アイコン取得&StatusDictionaryに追加 - if (tab != null && tab.IsInnerStorageTabType) - tab.AddPostQueue(post); - else - TabInformations.GetInstance().AddPost(post); + tab.AddPostQueue(post); } return minimumId; @@ -1078,7 +1067,7 @@ namespace OpenTween if (!TabInformations.GetInstance().ContainsTab(tab)) return; - var minimumId = this.CreatePostsFromSearchJson(searchResult, tab, read, count, more); + var minimumId = this.CreatePostsFromSearchJson(searchResult, tab, read, more); if (minimumId != null) tab.OldestId = minimumId.Value;