From f0bc21b1a84e8ad3aafdf6768baa6a56ee871b46 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 7 Jan 2013 00:54:24 +0400 Subject: fix default_feed_view=articles on tablets, bump version --- src/org/fox/ttrss/FeedCategoriesFragment.java | 2 +- src/org/fox/ttrss/FeedsActivity.java | 8 ++++++++ src/org/fox/ttrss/FeedsFragment.java | 2 +- src/org/fox/ttrss/HeadlinesActivity.java | 2 +- src/org/fox/ttrss/HeadlinesFragment.java | 5 ++++- 5 files changed, 15 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java index 65b3af36..7db81a4e 100644 --- a/src/org/fox/ttrss/FeedCategoriesFragment.java +++ b/src/org/fox/ttrss/FeedCategoriesFragment.java @@ -412,7 +412,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe if (list != null) { FeedCategory cat = (FeedCategory)list.getItemAtPosition(position); - if (m_activity.isSmallScreen() && "ARTICLES".equals(m_prefs.getString("default_view_mode", "HEADLINES")) && + if ("ARTICLES".equals(m_prefs.getString("default_view_mode", "HEADLINES")) && m_prefs.getBoolean("browse_cats_like_feeds", false)) { m_activity.openFeedArticles(new Feed(cat.id, cat.title, true)); diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java index bb423285..71eef787 100644 --- a/src/org/fox/ttrss/FeedsActivity.java +++ b/src/org/fox/ttrss/FeedsActivity.java @@ -320,6 +320,14 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe intent.putExtra("feed", feed); intent.putExtra("article", new Article()); startActivityForResult(intent, 0); + } else { + Intent intent = new Intent(FeedsActivity.this, HeadlinesActivity.class); + intent.putExtra("feed", feed); + intent.putExtra("article", (Article)null); + intent.putExtra("searchQuery", (String)null); + + startActivityForResult(intent, 0); + overridePendingTransition(R.anim.right_slide_in, 0); } } diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index 8375d4d9..62f0669e 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -256,7 +256,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh if (list != null) { Feed feed = (Feed)list.getItemAtPosition(position); - + if (feed.is_cat) { if (m_activity.isSmallScreen() && "ARTICLES".equals(m_prefs.getString("default_view_mode", "HEADLINES")) && m_prefs.getBoolean("browse_cats_like_feeds", false)) { diff --git a/src/org/fox/ttrss/HeadlinesActivity.java b/src/org/fox/ttrss/HeadlinesActivity.java index 3b497163..bc30ab08 100644 --- a/src/org/fox/ttrss/HeadlinesActivity.java +++ b/src/org/fox/ttrss/HeadlinesActivity.java @@ -73,7 +73,7 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL HeadlinesFragment hf = new HeadlinesFragment(feed, article); hf.setSearchQuery(searchQuery); - ArticlePager af = new ArticlePager(hf.getArticleById(article.id), feed); + ArticlePager af = new ArticlePager(article != null ? hf.getArticleById(article.id) : new Article(), feed); af.setSearchQuery(searchQuery); ft.replace(R.id.headlines_fragment, hf, FRAG_HEADLINES); diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 0de9d186..5248388f 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -84,7 +84,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public HeadlinesFragment(Feed feed, Article activeArticle) { m_feed = feed; - m_activeArticle = getArticleById(activeArticle.id); + + if (activeArticle != null) { + m_activeArticle = getArticleById(activeArticle.id); + } } public HeadlinesFragment() { -- cgit v1.2.3