Merge remote-tracking branch 'origin/master'

3 files changed, 18 insertions, 15 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
index f312675f..892891d2 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
@@ -560,7 +560,7 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
 
 	@Override
 	public boolean onContextItemSelected(MenuItem menuItem, UpdateView<DownloadFile> updateView, DownloadFile downloadFile) {
-		if(onContextItemSelected(menuItem, downloadFile)) {
+		if(onContextItemSelected(menuItem, downloadFile.getSong())) {
 			return true;
 		}
 
diff --git a/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java b/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
index a729ed4e..6006e280 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
@@ -319,21 +319,22 @@ public class ChromeCastController extends RemoteController {
 				meta.putString(MediaMetadata.KEY_ALBUM_ARTIST, song.getArtist());
 				meta.putString(MediaMetadata.KEY_ALBUM_TITLE, song.getAlbum());
 
-				String coverArt = "";
-				if(proxy == null || proxy instanceof WebProxy) {
-					coverArt = musicService.getCoverArtUrl(downloadService, song);
+				if(castDevice.hasCapability(CastDevice.CAPABILITY_VIDEO_IN)) {
+					if (proxy == null || proxy instanceof WebProxy) {
+						String coverArt = musicService.getCoverArtUrl(downloadService, song);
 
-					// If proxy is going, it is a web proxy
-					if(proxy != null) {
-						coverArt = proxy.getPublicAddress(coverArt);
-					}
+						// If proxy is going, it is a web proxy
+						if (proxy != null) {
+							coverArt = proxy.getPublicAddress(coverArt);
+						}
 
-					meta.addImage(new WebImage(Uri.parse(coverArt)));
-				} else {
-					File coverArtFile = FileUtil.getAlbumArtFile(downloadService, song);
-					if(coverArtFile != null && coverArtFile.exists()) {
-						coverArt = proxy.getPublicAddress(coverArtFile.getPath());
 						meta.addImage(new WebImage(Uri.parse(coverArt)));
+					} else {
+						File coverArtFile = FileUtil.getAlbumArtFile(downloadService, song);
+						if (coverArtFile != null && coverArtFile.exists()) {
+							String coverArt = proxy.getPublicAddress(coverArtFile.getPath());
+							meta.addImage(new WebImage(Uri.parse(coverArt)));
+						}
 					}
 				}
 			}
diff --git a/app/src/main/java/github/daneren2005/dsub/service/OfflineMusicService.java b/app/src/main/java/github/daneren2005/dsub/service/OfflineMusicService.java
index 2146cd15..17aaf804 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/OfflineMusicService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/OfflineMusicService.java
@@ -394,8 +394,8 @@ public class OfflineMusicService implements MusicService {
 
 						Reader reader = null;
 						BufferedReader buffer = null;
+						int songCount = 0;
 						try {
-							int songCount = 0;
 							reader = new FileReader(file);
 							buffer = new BufferedReader(reader);
 
@@ -427,7 +427,9 @@ public class OfflineMusicService implements MusicService {
 							Util.close(reader);
 						}
 
-						playlists.add(playlist);
+						if(songCount > 0) {
+							playlists.add(playlist);
+						}
 					}
 				}