aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2012-12-28 18:38:19 -0800
committerScott Jackson <daneren2005@gmail.com>2012-12-28 18:38:19 -0800
commita9c7bbb3b803ceab21afe5d3cdb4166f40cfc37a (patch)
tree5f5e470c7c3c45ecd5abc190220e8ec81815b167
parent59c72c25dc892250cc531441a0e443b7f894d949 (diff)
downloaddsub-a9c7bbb3b803ceab21afe5d3cdb4166f40cfc37a.tar.gz
dsub-a9c7bbb3b803ceab21afe5d3cdb4166f40cfc37a.tar.bz2
dsub-a9c7bbb3b803ceab21afe5d3cdb4166f40cfc37a.zip
Closes #81 Don't allow album lists to be mass played/shuffled
-rw-r--r--subsonic-android/res/menu/select_album_list.xml8
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java7
2 files changed, 14 insertions, 1 deletions
diff --git a/subsonic-android/res/menu/select_album_list.xml b/subsonic-android/res/menu/select_album_list.xml
new file mode 100644
index 00000000..b6db96aa
--- /dev/null
+++ b/subsonic-android/res/menu/select_album_list.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:id="@+id/menu_refresh"
+ android:icon="@drawable/action_refresh"
+ android:title="@string/menu.refresh"
+ android:showAsAction="always|withText"/>
+</menu>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
index 0cf380dd..de92d244 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
@@ -109,7 +109,12 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
public boolean onCreateOptionsMenu(Menu menu) {
com.actionbarsherlock.view.MenuInflater inflater = getSupportMenuInflater();
if(hideButtons) {
- inflater.inflate(R.menu.select_album, menu);
+ String albumListType = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE);
+ if(albumListType != null) {
+ inflater.inflate(R.menu.select_album_list, menu);
+ } else {
+ inflater.inflate(R.menu.select_album, menu);
+ }
hideButtons = false;
} else {
if(Util.isOffline(this)) {