From efbcbe7b89d3c4975951d7bddd17efa2a5fd335c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 30 May 2017 16:52:35 +0300 Subject: add offline_sort_by_feed --- .../java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'org.fox.ttrss/src/main/java/org/fox') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index e7e814a4..ebb78c2e 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -116,6 +116,10 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis menu.findItem(R.id.article_set_note).setVisible(false); menu.findItem(R.id.headlines_article_unread).setVisible(false); // TODO: implement + if (m_prefs.getBoolean("offline_sort_by_feed", false)) { + menu.findItem(R.id.catchup_above).setVisible(false); + } + super.onCreateContextMenu(menu, v, menuInfo); } @@ -361,7 +365,11 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis } String orderBy = (m_prefs.getBoolean("offline_oldest_first", false)) ? "updated" : "updated DESC"; - + + if (m_prefs.getBoolean("offline_sort_by_feed", false)) { + orderBy = "feed_title, " + orderBy; + } + if (m_searchQuery == null || m_searchQuery.equals("")) { return m_activity.getDatabase().query("articles LEFT JOIN feeds ON (feed_id = feeds."+BaseColumns._ID+")", new String[] { "articles.*", "feeds.title AS feed_title" }, feedClause, -- cgit v1.2.3-54-g00ecf