From 7d59182a9b508e3315e3417c83301e00ba260481 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 1 Jun 2017 23:55:49 +0300 Subject: [PATCH] actually disable swipe to dismiss when mark as read on scroll is set --- .../src/main/java/org/fox/ttrss/HeadlinesFragment.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index dcebdf81..ba8d068b 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -343,9 +343,7 @@ public class HeadlinesFragment extends Fragment { FloatingActionButton fab = (FloatingActionButton) view.findViewById(R.id.headlines_fab); - boolean enableSwipeToDismiss = m_prefs.getBoolean("headlines_swipe_to_dismiss", true); - - if (enableSwipeToDismiss) { + if (m_prefs.getBoolean("headlines_swipe_to_dismiss", true) && !m_prefs.getBoolean("headlines_mark_read_scroll", false) ) { ItemTouchHelper swipeHelper = new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) { @@ -527,8 +525,6 @@ public class HeadlinesFragment extends Fragment { } }); - //if (!enableSwipeToDismiss) registerForContextMenu(m_list); - if (m_activity.isSmallScreen()) { m_activity.setTitle(m_feed.title); }