Put a bunch of context menu options back

9 files changed, 76 insertions, 6 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java
index 6215bb4d..6c895edc 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -297,6 +297,7 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
 		}
 	}
 
+	// For reverting specific removals: https://github.com/daneren2005/Subsonic/commit/fbd1a68042dfc3601eaa0a9e37b3957bbdd51420
 	public boolean onContextItemSelected(MenuItem menuItem, Object selectedItem) {
 		Artist artist = selectedItem instanceof Artist ? (Artist) selectedItem : null;
 		Entry entry = selectedItem instanceof Entry ? (Entry) selectedItem : null;
@@ -313,9 +314,24 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
 			case R.id.artist_menu_play_last:
 				downloadRecursively(artist.getId(), false, true, false, false, false);
 				break;
+			case R.id.artist_menu_download:
+				downloadRecursively(artist.getId(), false, true, false, false, true);
+				break;
 			case R.id.artist_menu_star:
 				toggleStarred(artist);
 				break;
+			case R.id.album_menu_play_now:
+				artistOverride = true;
+				downloadRecursively(entry.getId(), false, false, true, false, false);
+				break;
+			case R.id.album_menu_play_last:
+				artistOverride = true;
+				downloadRecursively(entry.getId(), false, true, false, false, false);
+				break;
+			case R.id.album_menu_download:
+				artistOverride = true;
+				downloadRecursively(entry.getId(), false, true, false, false, true);
+				break;
 			case R.id.album_menu_star:
 				toggleStarred(entry);
 				break;
@@ -328,6 +344,9 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
 			case R.id.album_menu_share:
 				createShare(songs);
 				break;
+			case R.id.song_menu_play_next:
+				getDownloadService().download(songs, false, false, true, false);
+				break;
 			case R.id.song_menu_play_last:
 				getDownloadService().download(songs, false, false, false, false);
 				break;
diff --git a/app/src/main/res/menu/select_album_context.xml b/app/src/main/res/menu/select_album_context.xml
index 388fd1f5..b06f2d24 100644
--- a/app/src/main/res/menu/select_album_context.xml
+++ b/app/src/main/res/menu/select_album_context.xml
@@ -6,6 +6,20 @@
 		android:title="@string/common.info"/>
 
 	<item
+		android:id="@+id/album_menu_play_now"
+		android:title="@string/common.play_now"/>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/album_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
+
+	<item
+		android:id="@+id/album_menu_download"
+		android:title="@string/common.download"/>
+
+	<item
 		android:id="@+id/album_menu_show_artist"
 		android:title="@string/menu.show_artist"/>
 
diff --git a/app/src/main/res/menu/select_artist_context.xml b/app/src/main/res/menu/select_artist_context.xml
index 40f912db..8e87d932 100644
--- a/app/src/main/res/menu/select_artist_context.xml
+++ b/app/src/main/res/menu/select_artist_context.xml
@@ -15,6 +15,11 @@
 				android:title="@string/common.play_last"/>
 		</group>
 
+		<item
+			android:id="@+id/artist_menu_download"
+			android:title="@string/common.download"
+			/>
+
 		<group android:id="@+id/hide_star">
 			<item
 				android:id="@+id/artist_menu_star"
diff --git a/app/src/main/res/menu/select_artist_context_offline.xml b/app/src/main/res/menu/select_artist_context_offline.xml
index 2dc78ab8..0fb9aad7 100644
--- a/app/src/main/res/menu/select_artist_context_offline.xml
+++ b/app/src/main/res/menu/select_artist_context_offline.xml
@@ -8,6 +8,11 @@
 		android:id="@+id/artist_menu_play_shuffled"
 		android:title="@string/common.play_shuffled"/>
 
+	<item
+		android:id="@+id/artist_menu_download"
+		android:title="@string/common.download"
+		/>
+
 	<group android:id="@+id/hide_play_last">
 		<item
 			android:id="@+id/artist_menu_play_last"
diff --git a/app/src/main/res/menu/select_bookmark_context.xml b/app/src/main/res/menu/select_bookmark_context.xml
index aaa3e3e8..20808cf5 100644
--- a/app/src/main/res/menu/select_bookmark_context.xml
+++ b/app/src/main/res/menu/select_bookmark_context.xml
@@ -6,6 +6,12 @@
 		android:id="@+id/bookmark_menu_info"
 		android:title="@string/common.info"/>
 
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
 	<group android:id="@+id/hide_play_last">
 		<item
 			android:id="@+id/song_menu_play_last"
diff --git a/app/src/main/res/menu/select_podcast_episode_context.xml b/app/src/main/res/menu/select_podcast_episode_context.xml
index d535cc7e..057ff187 100644
--- a/app/src/main/res/menu/select_podcast_episode_context.xml
+++ b/app/src/main/res/menu/select_podcast_episode_context.xml
@@ -4,8 +4,13 @@
 	
 	<item
 		android:id="@+id/song_menu_info"
-		android:title="@string/common.info"
-		/>
+		android:title="@string/common.info"/>
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
 
 	<group android:id="@+id/hide_play_last">
 		<item
diff --git a/app/src/main/res/menu/select_podcast_episode_context_offline.xml b/app/src/main/res/menu/select_podcast_episode_context_offline.xml
index a34d7f08..c3e98ef0 100644
--- a/app/src/main/res/menu/select_podcast_episode_context_offline.xml
+++ b/app/src/main/res/menu/select_podcast_episode_context_offline.xml
@@ -4,8 +4,13 @@
 	
 	<item
 		android:id="@+id/song_menu_info"
-		android:title="@string/common.info"
-		/>
+		android:title="@string/common.info"/>
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
 
 	<group android:id="@+id/hide_play_last">
 		<item
diff --git a/app/src/main/res/menu/select_song_context.xml b/app/src/main/res/menu/select_song_context.xml
index b1e3c979..ef5478b6 100644
--- a/app/src/main/res/menu/select_song_context.xml
+++ b/app/src/main/res/menu/select_song_context.xml
@@ -7,6 +7,12 @@
 		android:title="@string/common.info"
 		/>
 
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
 	<group android:id="@+id/hide_play_last">
 		<item
 			android:id="@+id/song_menu_play_last"
diff --git a/app/src/main/res/menu/select_song_context_offline.xml b/app/src/main/res/menu/select_song_context_offline.xml
index 1e697f30..da0f366e 100644
--- a/app/src/main/res/menu/select_song_context_offline.xml
+++ b/app/src/main/res/menu/select_song_context_offline.xml
@@ -4,8 +4,13 @@
 	
 	<item
 		android:id="@+id/song_menu_info"
-		android:title="@string/common.info"
-		/>
+		android:title="@string/common.info"/>
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
 
 	<group android:id="@+id/hide_play_last">
 		<item