diff options
author | Andrew Dolgov <[email protected]> | 2017-06-26 16:53:33 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2017-06-26 16:53:33 +0300 |
commit | 39140ba3ee900990a3b2267642e0e4ecd2f556bf (patch) | |
tree | bcc0917a62389a867cb1dfcfc0c157c51f4ff87e /org.fox.ttrss/src/main/java | |
parent | f729a6ced7e145652247acb84d4dfb502eebdfb8 (diff) |
feeds fragment: use order_id for categories
Diffstat (limited to 'org.fox.ttrss/src/main/java')
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index cf242daf..02f98a4d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -203,10 +203,16 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi class FeedOrderComparator implements Comparator<Feed> { @Override - public int compare(Feed a, Feed b) { + public int compare(Feed a, Feed b) { + Log.d(TAG, "A:" + a.title + " " + a.is_cat + " " + a.order_id); + Log.d(TAG, "B:" + b.title + " " + b.is_cat + " " + b.order_id); + if (a.id >= 0 && b.id >= 0) if (a.is_cat && b.is_cat) - return a.title.toUpperCase().compareTo(b.title.toUpperCase()); + if (a.order_id != 0 && b.order_id != 0) + return a.order_id - b.order_id; + else + return a.title.toUpperCase().compareTo(b.title.toUpperCase()); else if (a.is_cat && !b.is_cat) return -1; else if (!a.is_cat && b.is_cat) |