From 58d0ca46651c9703c338e3aad9e1c61bdd54e062 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Tue, 4 Mar 2014 18:36:37 -0800
Subject: Web fixes

---
 .../daneren2005/dsub/fragments/DownloadFragment.java | 20 ++++++++++----------
 .../dsub/provider/DSubWidgetProvider.java            |  1 +
 src/github/daneren2005/dsub/util/Util.java           |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
index 36a58f66..409e6270 100644
--- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
@@ -564,26 +564,26 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
 
 				Intent intent = new Intent(context, SubsonicFragmentActivity.class);
 				intent.putExtra(Constants.INTENT_EXTRA_VIEW_ALBUM, true);
-				String id;
-				String name;
+				String albumId;
+				String albumName;
 				if(menuItemId == R.id.menu_show_album) {
 					if(Util.isTagBrowsing(context)) {
-						id = entry.getAlbumId();
+						albumId = entry.getAlbumId();
 					} else {
-						id = entry.getParent();
+						albumId = entry.getParent();
 					}
-					name = entry.getAlbum();
+					albumName = entry.getAlbum();
 				} else {
 					if(Util.isTagBrowsing(context)) {
-						id = entry.getArtistId();
+						albumId = entry.getArtistId();
 					} else {
-						id = entry.getGrandParent();
+						albumId = entry.getGrandParent();
 					}
-					name = entry.getArtist();
+					albumName = entry.getArtist();
 					intent.putExtra(Constants.INTENT_EXTRA_NAME_ARTIST, true);
 				}
-				intent.putExtra(Constants.INTENT_EXTRA_NAME_ID, id);
-				intent.putExtra(Constants.INTENT_EXTRA_NAME_NAME, name);
+				intent.putExtra(Constants.INTENT_EXTRA_NAME_ID, albumId);
+				intent.putExtra(Constants.INTENT_EXTRA_NAME_NAME, albumName);
 				intent.putExtra(Constants.INTENT_EXTRA_FRAGMENT_TYPE, "Artist");
 
 				if(Util.isOffline(context)) {
diff --git a/src/github/daneren2005/dsub/provider/DSubWidgetProvider.java b/src/github/daneren2005/dsub/provider/DSubWidgetProvider.java
index 7d80df16..be7dedf6 100644
--- a/src/github/daneren2005/dsub/provider/DSubWidgetProvider.java
+++ b/src/github/daneren2005/dsub/provider/DSubWidgetProvider.java
@@ -47,6 +47,7 @@ import github.daneren2005.dsub.domain.MusicDirectory;
 import github.daneren2005.dsub.service.DownloadService;
 import github.daneren2005.dsub.util.Constants;
 import github.daneren2005.dsub.util.FileUtil;
+import github.daneren2005.dsub.util.ImageLoader;
 import github.daneren2005.dsub.util.Util;
 
 /**
diff --git a/src/github/daneren2005/dsub/util/Util.java b/src/github/daneren2005/dsub/util/Util.java
index 13392329..933d3777 100644
--- a/src/github/daneren2005/dsub/util/Util.java
+++ b/src/github/daneren2005/dsub/util/Util.java
@@ -1015,7 +1015,7 @@ public final class Util {
      // Set the album art.
         try {
 			ImageLoader imageLoader = SubsonicActivity.getStaticImageLoader(context);
-			Bitmap bitmap;
+			Bitmap bitmap = null;
 			if(imageLoader != null) {
 				bitmap = imageLoader.getCachedImage(context, song, false);
 			}
-- 
cgit v1.2.3