From 786422a027ec6badcc3e639e5222d1b900abac53 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 20 Sep 2012 01:39:38 +0400 Subject: fix two context menu crashes --- src/org/fox/ttrss/FeedCategoriesFragment.java | 4 ++++ src/org/fox/ttrss/FeedsFragment.java | 3 +-- src/org/fox/ttrss/HeadlinesFragment.java | 2 +- src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java | 4 ++++ src/org/fox/ttrss/offline/OfflineFeedsFragment.java | 4 ++++ 5 files changed, 14 insertions(+), 3 deletions(-) (limited to 'src/org') diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java index ac5c0046..e3186cf3 100644 --- a/src/org/fox/ttrss/FeedCategoriesFragment.java +++ b/src/org/fox/ttrss/FeedCategoriesFragment.java @@ -145,6 +145,10 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe if (cat != null) menu.setHeaderTitle(cat.title); + if (!m_activity.isSmallScreen()) { + menu.findItem(R.id.browse_articles).setVisible(false); + } + super.onCreateContextMenu(menu, v, menuInfo); } diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index a8284c76..f7376a88 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -181,8 +181,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh menu.setHeaderTitle(feed.title); if (!m_activity.isSmallScreen()) { - menu.findItem(R.id.browse_headlines).setVisible(false); - menu.findItem(R.id.browse_feeds).setVisible(false); + menu.findItem(R.id.browse_articles).setVisible(false); } super.onCreateContextMenu(menu, v, menuInfo); diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index f2148003..296d4ea9 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -250,7 +250,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, menu.findItem(R.id.set_labels).setEnabled(m_activity.getApiLevel() >= 1); menu.findItem(R.id.article_set_note).setEnabled(m_activity.getApiLevel() >= 1); - + super.onCreateContextMenu(menu, v, menuInfo); } diff --git a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java index d46e5587..a5595681 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java @@ -46,6 +46,10 @@ public class OfflineFeedCategoriesFragment extends Fragment implements OnItemCli if (cursor != null) menu.setHeaderTitle(cursor.getString(cursor.getColumnIndex("title"))); + if (!m_activity.isSmallScreen()) { + menu.findItem(R.id.browse_articles).setVisible(false); + } + super.onCreateContextMenu(menu, v, menuInfo); } diff --git a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java index 87af187c..7eadd373 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java +++ b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java @@ -85,6 +85,10 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene if (cursor != null) menu.setHeaderTitle(cursor.getString(cursor.getColumnIndex("title"))); + if (!m_activity.isSmallScreen()) { + menu.findItem(R.id.browse_articles).setVisible(false); + } + super.onCreateContextMenu(menu, v, menuInfo); } -- cgit v1.2.3