aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-03-14 11:15:32 -0700
committerScott Jackson <daneren2005@gmail.com>2014-03-14 11:15:32 -0700
commit21863a59f40ba12a3d7b0db225aaa510fc863bc7 (patch)
treef4ef3b2789790db72c3d9148e5deac51c3550556
parent13605bd1032625c36ac583c55bcabfe6c3cd9e08 (diff)
downloaddsub-21863a59f40ba12a3d7b0db225aaa510fc863bc7.tar.gz
dsub-21863a59f40ba12a3d7b0db225aaa510fc863bc7.tar.bz2
dsub-21863a59f40ba12a3d7b0db225aaa510fc863bc7.zip
Fix share not being on now playing, not hiding star if set
-rw-r--r--res/menu/nowplaying_context.xml6
-rw-r--r--src/github/daneren2005/dsub/fragments/DownloadFragment.java12
2 files changed, 18 insertions, 0 deletions
diff --git a/res/menu/nowplaying_context.xml b/res/menu/nowplaying_context.xml
index fd3d5b6a..5cc73e79 100644
--- a/res/menu/nowplaying_context.xml
+++ b/res/menu/nowplaying_context.xml
@@ -31,6 +31,12 @@
android:id="@+id/menu_star"
android:title="@string/common.star"/>
</group>
+
+ <group android:id="@+id/hide_share">
+ <item
+ android:id="@+id/menu_share"
+ android:title="@string/menu.share"/>
+ </group>
<item
android:id="@+id/menu_add_playlist"
diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
index bf62fce0..6c9be122 100644
--- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
@@ -546,6 +546,14 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
if (downloadFile.getSong().getGrandParent() == null) {
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);
+ }
}
}
@@ -715,6 +723,10 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
case R.id.menu_info:
displaySongInfo(song.getSong());
return true;
+ case R.id.menu_share:
+ songs = new ArrayList<MusicDirectory.Entry>(1);
+ songs.add(song.getSong());
+ createShare(songs);
default:
return false;
}