From fa3746db84c2afd4d7f3edb2c5728e2c9cf27a7b Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 25 Jun 2015 17:47:02 -0700
Subject: #517 Missed in previous commit

---
 .../dsub/fragments/DownloadFragment.java           | 48 ++++++++--------------
 1 file changed, 17 insertions(+), 31 deletions(-)

(limited to 'app/src/main/java/github')

diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/DownloadFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/DownloadFragment.java
index b89a25c5..36653ff5 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/DownloadFragment.java
@@ -162,6 +162,23 @@ public class DownloadFragment extends SelectRecyclerFragment<DownloadFile> {
 
 	}
 
+	@Override
+	public void onCreateContextMenu(Menu menu, MenuInflater menuInflater, UpdateView<DownloadFile> updateView, DownloadFile downloadFile) {
+		MusicDirectory.Entry selectedItem = downloadFile.getSong();
+		onCreateContextMenuSupport(menu, menuInflater, updateView, selectedItem);
+		if(!selectedItem.isVideo() && !Util.isOffline(context)) {
+			menu.removeItem(R.id.song_menu_remove_playlist);
+		}
+
+		recreateContextMenu(menu);
+	}
+
+	@Override
+	public boolean onContextItemSelected(MenuItem menuItem, UpdateView<DownloadFile> updateView, DownloadFile downloadFile) {
+		MusicDirectory.Entry selectedItem = downloadFile.getSong();
+		return onContextItemSelected(menuItem, selectedItem);
+	}
+
 	@Override
 	public boolean onOptionsItemSelected(MenuItem menuItem) {
 		if(super.onOptionsItemSelected(menuItem)) {
@@ -193,37 +210,6 @@ public class DownloadFragment extends SelectRecyclerFragment<DownloadFile> {
 		return false;
 	}
 
-	@Override
-	public void onCreateContextMenu(android.view.ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) {
-		super.onCreateContextMenu(menu, view, menuInfo);
-		UpdateView targetView = adapter.getContextView();
-		menuInfo = new AdapterView.AdapterContextMenuInfo(targetView, 0, 0);
-
-		DownloadFile downloadFile = adapter.getContextItem();
-		MusicDirectory.Entry selectedItem = downloadFile.getSong();
-		onCreateContextMenu(menu, view, menuInfo, selectedItem);
-		if(!selectedItem.isVideo() && !Util.isOffline(context)) {
-			menu.removeItem(R.id.song_menu_remove_playlist);
-		}
-
-		recreateContextMenu(menu);
-	}
-
-	@Override
-	public boolean onContextItemSelected(MenuItem menuItem) {
-		if(menuItem.getGroupId() != getSupportTag()) {
-			return false;
-		}
-
-		DownloadFile downloadFile = adapter.getContextItem();
-		MusicDirectory.Entry selectedItem = downloadFile.getSong();
-		if(onContextItemSelected(menuItem, selectedItem)) {
-			return true;
-		}
-
-		return true;
-	}
-
 	private void update() {
 		DownloadService downloadService = getDownloadService();
 		if (downloadService == null || objects == null || adapter == null) {
-- 
cgit v1.2.3