fix catchup_above to behave as the desktop version (not including

selected article)
This commit is contained in:
Andrew Dolgov 2014-01-23 16:03:38 +04:00
parent e3280a06ab
commit e840ebbc96
3 changed files with 10 additions and 7 deletions

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="229" android:versionCode="230"
android:versionName="1.33" > android:versionName="1.34" >
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"

View File

@ -229,13 +229,13 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
ArticleList articles = getAllArticles(); ArticleList articles = getAllArticles();
ArticleList tmp = new ArticleList(); ArticleList tmp = new ArticleList();
for (Article a : articles) { for (Article a : articles) {
if (a.unread) { if (article.id == a.id)
break;
if (a.unread) {
a.unread = false; a.unread = false;
tmp.add(a); tmp.add(a);
} }
if (article.id == a.id)
break;
} }
if (tmp.size() > 0) { if (tmp.size() > 0) {
m_activity.toggleArticlesUnread(tmp); m_activity.toggleArticlesUnread(tmp);

View File

@ -999,10 +999,13 @@ public class OnlineActivity extends CommonActivity {
ArticleList articles = hf.getAllArticles(); ArticleList articles = hf.getAllArticles();
ArticleList tmp = new ArticleList(); ArticleList tmp = new ArticleList();
for (Article a : articles) { for (Article a : articles) {
a.unread = false;
tmp.add(a);
if (article.id == a.id) if (article.id == a.id)
break; break;
if (a.unread) {
a.unread = false;
tmp.add(a);
}
} }
if (tmp.size() > 0) { if (tmp.size() > 0) {
toggleArticlesUnread(tmp); toggleArticlesUnread(tmp);