summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java2
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java5
2 files changed, 6 insertions, 1 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index 15915876..f17e392c 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -518,7 +518,7 @@ public class FeedsFragment extends Fragment implements OnSharedPreferenceChangeL
} else {
Feed tmpFeed = new Feed(feed);
- if (!neverOpenHeadlines(feed))
+ if (!neverOpenHeadlines(feed) && !tmpFeed.always_open_headlines)
tmpFeed.always_open_headlines = m_prefs.getBoolean("browse_cats_like_feeds", false);
m_activity.onFeedSelected(tmpFeed);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 77ef1f8b..12450411 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -130,6 +130,11 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
}
public void initialize(Feed feed) {
+
+ // clear loaded headlines before switching feed
+ if (feed != m_feed)
+ Application.getArticlesModel().update(new ArticleList());
+
m_feed = feed;
}