group same artist/album combinations in lru cache

miikaah · Jun 17, 2014 · 855a2e4 · 855a2e4
1 parent 04f29a1
commit 855a2e4
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/ch/blinkenlights/android/vanilla/Song.java b/src/ch/blinkenlights/android/vanilla/Song.java
@@ -87,25 +87,29 @@ public class Song implements Comparable<Song> {
 	};
 
 	private class LruCacheKey {
-		Long id;
+		long id;
+		long artistId;
+		long albumId;
 		String path;
 
-		public LruCacheKey(Long id, String path) {
+		public LruCacheKey(long id, long artistId, long albumId, String path) {
 			this.id = id;
+			this.artistId = artistId;
+			this.albumId = albumId;
 			this.path = path;
 		}
 
 		@Override
 		public boolean equals(Object obj) {
-			if (obj instanceof LruCacheKey && id.equals( ((LruCacheKey)obj).id )) {
+			if (obj instanceof LruCacheKey && this.albumId == ((LruCacheKey)obj).albumId && this.artistId == ((LruCacheKey)obj).artistId) {
 				return true;
 			}
 			return false;
 		}
 
 		@Override
 		public int hashCode() {
-			return this.path.length();
+			return (int)( 0xFFFFFF & (this.artistId + this.albumId) );
 		}
 
 		@Override
@@ -135,6 +139,7 @@ public Bitmap create(LruCacheKey key)
 Log.v("VanillaMusic", "Cache miss on key "+key);
 			try {
 				ParcelFileDescriptor parcelFileDescriptor = res.openFileDescriptor(uri, "r");
+
 				if (parcelFileDescriptor != null) {
 					FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();
 					BitmapFactory.Options bopts = new BitmapFactory.Options();
@@ -304,7 +309,7 @@ public Bitmap getCover(Context context)
 		if (sCoverCache == null)
 			sCoverCache = new CoverCache(context.getApplicationContext());
 
-		LruCacheKey key = new LruCacheKey(id, path);
+		LruCacheKey key = new LruCacheKey(id, artistId, albumId, path);
 		Bitmap cover = sCoverCache.get(key);
 
 		if (cover == null)