From e840ebbc96d080b0d0ef278ba74461dbd3b0a5c2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 23 Jan 2014 16:03:38 +0400
Subject: [PATCH] fix catchup_above to behave as the desktop version (not
 including selected article)

---
 AndroidManifest.xml                      | 4 ++--
 src/org/fox/ttrss/HeadlinesFragment.java | 6 +++---
 src/org/fox/ttrss/OnlineActivity.java    | 7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 73ef10ea..b140ace3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="229"
-    android:versionName="1.33" >
+    android:versionCode="230"
+    android:versionName="1.34" >
 
     <uses-sdk
         android:minSdkVersion="8"
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);