aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-06-23 18:02:30 -0700
committerScott Jackson <daneren2005@gmail.com>2014-06-23 18:02:30 -0700
commitcd36c7449afb77d1016836105a33828cd0f8bc20 (patch)
treea55c30896ed4cc29856519e10b7a1b2eb61935db /src
parent42a5783c84d71d2d1791af154e3fef7bc6d78419 (diff)
downloaddsub-cd36c7449afb77d1016836105a33828cd0f8bc20.tar.gz
dsub-cd36c7449afb77d1016836105a33828cd0f8bc20.tar.bz2
dsub-cd36c7449afb77d1016836105a33828cd0f8bc20.zip
Fix now playing fragment not using same hide logic
Diffstat (limited to 'src')
-rw-r--r--src/github/daneren2005/dsub/fragments/NowPlayingFragment.java8
-rw-r--r--src/github/daneren2005/dsub/fragments/SubsonicFragment.java5
2 files changed, 6 insertions, 7 deletions
diff --git a/src/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/src/github/daneren2005/dsub/fragments/NowPlayingFragment.java
index 924c5bd0..e7c34d9a 100644
--- a/src/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/src/github/daneren2005/dsub/fragments/NowPlayingFragment.java
@@ -578,13 +578,7 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
menu.findItem(R.id.menu_show_artist).setVisible(false);
}
- SharedPreferences prefs = Util.getPreferences(context);
- if(!prefs.getBoolean(Constants.PREFERENCES_KEY_MENU_STAR, true)) {
- menu.setGroupVisible(R.id.hide_star, false);
- }
- if(!prefs.getBoolean(Constants.PREFERENCES_KEY_MENU_SHARED, true)) {
- menu.setGroupVisible(R.id.hide_share, false);
- }
+ hideMenuItems(menu);
}
}
diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
index 270cef2b..1e3f832d 100644
--- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -203,6 +203,10 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
}
}
+ hideMenuItems(menu);
+ }
+
+ protected void hideMenuItems(ContextMenu menu) {
if(!Util.checkServerVersion(context, "1.8")) {
menu.setGroupVisible(R.id.server_1_8, false);
menu.setGroupVisible(R.id.hide_star, false);
@@ -210,6 +214,7 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
if(!Util.checkServerVersion(context, "1.10.1")) {
menu.setGroupVisible(R.id.server_1_10, false);
}
+
SharedPreferences prefs = Util.getPreferences(context);
if(!prefs.getBoolean(Constants.PREFERENCES_KEY_MENU_PLAY_NEXT, true)) {
menu.setGroupVisible(R.id.hide_play_next, false);