From 25ee53c874cd6b884f0fb9a6cf2c4b1566b6a5f5 Mon Sep 17 00:00:00 2001
From: Mark Anderson <manderson23@gmail.com>
Date: Mon, 3 Aug 2015 23:02:28 +0100
Subject: [PATCH] Change volume key navigation to always match left/right
 swipe.

---
 .../activity/GlobalSharedStoriesReading.java  |  5 ---
 .../newsblur/activity/ReadStoriesReading.java |  6 ---
 .../src/com/newsblur/activity/Reading.java    | 44 ++++++-------------
 .../activity/SavedStoriesReading.java         |  5 ---
 4 files changed, 14 insertions(+), 46 deletions(-)

diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesReading.java b/clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesReading.java
index af79f4e95..69cf7e59d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesReading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesReading.java
@@ -25,9 +25,4 @@ public class GlobalSharedStoriesReading extends Reading {
         menu.removeItem(R.id.menu_reading_markunread);
         return true;
     }
-
-    @Override
-    protected boolean unreadSearchingSupported() {
-        return false;
-    }
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/ReadStoriesReading.java b/clients/android/NewsBlur/src/com/newsblur/activity/ReadStoriesReading.java
index cdcda94b6..07bb23d96 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/ReadStoriesReading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/ReadStoriesReading.java
@@ -6,7 +6,6 @@ import android.content.Loader;
 
 import com.newsblur.R;
 import com.newsblur.database.MixedFeedsReadingAdapter;
-import com.newsblur.util.FeedUtils;
 import com.newsblur.util.UIUtils;
 
 public class ReadStoriesReading extends Reading {
@@ -25,9 +24,4 @@ public class ReadStoriesReading extends Reading {
     public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
         super.onLoadFinished(loader, cursor);
     }
-
-    @Override
-    protected boolean unreadSearchingSupported() {
-        return false;
-    }
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/Reading.java b/clients/android/NewsBlur/src/com/newsblur/activity/Reading.java
index 4e2a8aca9..0e08ab98a 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/Reading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/Reading.java
@@ -771,44 +771,28 @@ public abstract class Reading extends NbActivity implements OnPageChangeListener
     private void processVolumeKeyNavigationEvent(int keyCode) {
         if ((keyCode == KeyEvent.KEYCODE_VOLUME_DOWN && volumeKeyNavigation == VolumeKeyNavigation.DOWN_NEXT) ||
             (keyCode == KeyEvent.KEYCODE_VOLUME_UP && volumeKeyNavigation == VolumeKeyNavigation.UP_NEXT)) {
-            if (unreadSearchingSupported()) {
-                overlayRight(overlayRight);
-            } else {
-                if (pager == null) return;
-                int nextPosition = pager.getCurrentItem() + 1;
-                if (nextPosition < readingAdapter.getCount()) {
-                    try {
-                        pager.setCurrentItem(nextPosition);
-                    } catch (Exception e) {
-                        // Just in case cursor changes.
-                    }
+            if (pager == null) return;
+            int nextPosition = pager.getCurrentItem() + 1;
+            if (nextPosition < readingAdapter.getCount()) {
+                try {
+                    pager.setCurrentItem(nextPosition);
+                } catch (Exception e) {
+                    // Just in case cursor changes.
                 }
             }
         } else {
-            if (unreadSearchingSupported()) {
-                overlayLeft(overlayLeft);
-            } else {
-                if (pager == null) return;
-                int nextPosition = pager.getCurrentItem() - 1;
-                if (nextPosition >= 0) {
-                    try {
-                        pager.setCurrentItem(nextPosition);
-                    } catch (Exception e) {
-                        // Just in case cursor changes.
-                    }
+            if (pager == null) return;
+            int nextPosition = pager.getCurrentItem() - 1;
+            if (nextPosition >= 0) {
+                try {
+                    pager.setCurrentItem(nextPosition);
+                } catch (Exception e) {
+                    // Just in case cursor changes.
                 }
             }
         }
     }
 
-    /**
-     * Global shared, saved and read stories don't support searching for unreads so we need to
-     * fall back to swipe left/right behaviour.
-     */
-    protected boolean unreadSearchingSupported() {
-        return true;
-    }
-
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         // Required to prevent the default sound playing when the volume key is pressed
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesReading.java b/clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesReading.java
index 3ca3936c9..56cdd6adf 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesReading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesReading.java
@@ -27,9 +27,4 @@ public class SavedStoriesReading extends Reading {
         FeedUtils.dbHelper.markSavedReadingSession();
         super.onLoadFinished(loader, cursor);
     }
-
-    @Override
-    protected boolean unreadSearchingSupported() {
-        return false;
-    }
 }