From efbcbe7b89d3c4975951d7bddd17efa2a5fd335c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 30 May 2017 16:52:35 +0300
Subject: [PATCH] add offline_sort_by_feed

---
 org.fox.ttrss/src/main/AndroidManifest.xml             |  4 ++--
 .../fox/ttrss/offline/OfflineHeadlinesFragment.java    | 10 +++++++++-
 org.fox.ttrss/src/main/res/values/strings.xml          |  1 +
 org.fox.ttrss/src/main/res/xml/preferences.xml         |  5 +++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 14fc4f51..896d56db 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="422"
-    android:versionName="1.188" >
+    android:versionCode="423"
+    android:versionName="1.189" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
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, 
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 15c3b567..2b59e50e 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -254,4 +254,5 @@
     <string name="widget_background_transparent">Transparent</string>
     <string name="pref_widget_background">Background color</string>
     <string name="pref_widget_update_interval_summary">This interval is imprecise due to Android limitations</string>
+    <string name="prefs_offline_sort_by_feed">Group headlines by feeds</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 9a31b6c8..43ed1bb0 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -182,6 +182,11 @@
             android:summary="@string/offline_articles_to_download_long"
             android:title="@string/offline_articles_to_download" />
 
+        <org.fox.ttrss.util.LessBrokenSwitchPreference
+            android:defaultValue="false"
+            android:key="offline_sort_by_feed"
+            android:title="@string/prefs_offline_sort_by_feed" />
+
         <org.fox.ttrss.util.LessBrokenSwitchPreference
             android:defaultValue="false"
             android:key="offline_image_cache_enabled"