From 131f355ce9546c48e649661ba64f4b198177bf6d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 4 Jun 2015 23:49:37 +0300 Subject: fix clicking on unread only footer behaving as a go offline entry --- org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java | 2 +- org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java | 2 +- .../src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java index 1dc880be..731b2432 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java @@ -81,7 +81,7 @@ public abstract class BaseFeedlistFragment extends Fragment { } }); - text.setOnClickListener(new View.OnClickListener() { + footer.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { rowSwitch.setChecked(!rowSwitch.isChecked()); 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 e01b4eed..37c89573 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 @@ -381,7 +381,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi return; } - if (position == list.getCount() - 2) { + if (!m_enableParentBtn && position == list.getCount() - 2) { m_activity.switchOffline(); return; } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java index 1504a734..d23897f7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java @@ -235,7 +235,7 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem return; } - if (position == list.getCount() - 2) { + if (!m_enableParentBtn && position == list.getCount() - 2) { m_activity.switchOnline(); return; } -- cgit v1.2.3