diff options
| author | Andrew Dolgov <[email protected]> | 2014-01-23 16:03:38 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2014-01-23 16:03:38 +0400 |
| commit | e840ebbc96d080b0d0ef278ba74461dbd3b0a5c2 (patch) | |
| tree | e4a23041aa47b181edaea672ad2b0dc37886da45 /src | |
| parent | e3280a06ab1f6412a854d9626f44edbfeb974296 (diff) | |
fix catchup_above to behave as the desktop version (not including
selected article)
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 6 | ||||
| -rw-r--r-- | src/org/fox/ttrss/OnlineActivity.java | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 84051cd5..11baf482 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -229,13 +229,13 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, ArticleList articles = getAllArticles(); ArticleList tmp = new ArticleList(); for (Article a : articles) { - if (a.unread) { + if (article.id == a.id) + break; + if (a.unread) { a.unread = false; tmp.add(a); } - if (article.id == a.id) - break; } if (tmp.size() > 0) { m_activity.toggleArticlesUnread(tmp); diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java index 1169c9c9..c082e797 100644 --- a/src/org/fox/ttrss/OnlineActivity.java +++ b/src/org/fox/ttrss/OnlineActivity.java @@ -999,10 +999,13 @@ public class OnlineActivity extends CommonActivity { ArticleList articles = hf.getAllArticles(); ArticleList tmp = new ArticleList(); for (Article a : articles) { - a.unread = false; - tmp.add(a); if (article.id == a.id) break; + + if (a.unread) { + a.unread = false; + tmp.add(a); + } } if (tmp.size() > 0) { toggleArticlesUnread(tmp); |