diff options
| -rw-r--r-- | res/menu/feed_menu.xml | 4 | ||||
| -rw-r--r-- | src/org/fox/ttrss/FeedsFragment.java | 18 |
2 files changed, 17 insertions, 5 deletions
diff --git a/res/menu/feed_menu.xml b/res/menu/feed_menu.xml index df8e4862..dc859124 100644 --- a/res/menu/feed_menu.xml +++ b/res/menu/feed_menu.xml @@ -8,6 +8,10 @@ android:id="@+id/browse_articles" android:title="@string/category_browse_articles"/> + <item + android:id="@+id/browse_feeds" + android:title="@string/category_browse_feeds"/> + <item android:id="@+id/catchup_feed" android:title="@string/catchup"/> diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index 7462876c..88538399 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -155,6 +155,14 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh }
}
return true;
+ case R.id.browse_feeds:
+ if (true) {
+ Feed feed = getFeedAtPosition(info.position);
+ if (feed != null) {
+ m_activity.onCatSelected(new FeedCategory(feed.id, feed.title, feed.unread), false);
+ }
+ }
+ return true;
case R.id.catchup_feed:
if (true) {
Feed feed = getFeedAtPosition(info.position);
@@ -186,6 +194,10 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh menu.findItem(R.id.browse_articles).setVisible(false);
}
+ if (!feed.is_cat) {
+ menu.findItem(R.id.browse_feeds).setVisible(false);
+ }
+
super.onCreateContextMenu(menu, v, menuInfo);
}
@@ -263,11 +275,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh m_activity.openFeedArticles(feed);
} else {
- FeedCategory cat = new FeedCategory();
- cat.id = feed.id;
- cat.title = feed.title;
-
- m_activity.onCatSelected(cat);
+ m_activity.onCatSelected(new FeedCategory(feed.id, feed.title, feed.unread));
}
} else {
if ("ARTICLES".equals(m_prefs.getString("default_view_mode", "HEADLINES"))) {
|