From f4570f4927c0ddc1b9700766fc730dab5c1df8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C3=96nnerby?= <onnerby@gmail.com>
Date: Wed, 24 Mar 2010 23:51:03 +0000
Subject: [PATCH] Small cover fix for android client. Android client v1.0.9.

---
 src/android/AndroidManifest.xml               |  4 ++--
 .../src/org/musikcube/app1/PlayerControl.java | 20 ++++++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml
index 43ab0dfd9..c48f7c1d0 100644
--- a/src/android/AndroidManifest.xml
+++ b/src/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.musikcube.app1"
-      android:versionName="1.0.8" android:versionCode="8">
+      android:versionCode="9" android:versionName="1.0.9">
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="App" android:debuggable="false">
         <activity android:name=".main"
                   android:label="@string/app_name" android:launchMode="singleTask" android:screenOrientation="portrait">
@@ -20,7 +20,7 @@
 <activity android:name="CategorySelect" android:launchMode="singleTask"></activity>
 <activity android:name="Search"></activity>
 </application>
-    <uses-sdk android:minSdkVersion="3" />
+    <uses-sdk android:minSdkVersion="3"/>
 
 
 <uses-permission android:name="android.permission.INTERNET"></uses-permission>
diff --git a/src/android/src/org/musikcube/app1/PlayerControl.java b/src/android/src/org/musikcube/app1/PlayerControl.java
index 9451b2b14..1fca98965 100644
--- a/src/android/src/org/musikcube/app1/PlayerControl.java
+++ b/src/android/src/org/musikcube/app1/PlayerControl.java
@@ -212,7 +212,9 @@ public class PlayerControl extends Activity implements OnTrackUpdateListener {
 			if(thumbnailId!=0){
 				// Load image
 				Library library	= Library.GetInstance();
-				new DownloadAlbumCoverTask().execute("http://"+library.host+":"+library.httpPort+"/cover/?cover_id="+thumbnailId);
+				String thumbString	= new String(""+thumbnailId);
+				
+				new DownloadAlbumCoverTask().execute("http://"+library.host+":"+library.httpPort+"/cover/?cover_id="+thumbnailId,thumbString);
 			}
 		}
 		
@@ -228,8 +230,11 @@ public class PlayerControl extends Activity implements OnTrackUpdateListener {
 	
 	private class DownloadAlbumCoverTask extends AsyncTask<String,Integer,Bitmap>{
 
+		private String thumbString;
+		
 		protected Bitmap doInBackground(String... params) {
 			try {
+				this.thumbString	= params[1];
 				URL url	= new URL(params[0]);
 		        HttpURLConnection conn= (HttpURLConnection)url.openConnection();
 	            conn.setDoInput(true);
@@ -246,8 +251,17 @@ public class PlayerControl extends Activity implements OnTrackUpdateListener {
 		protected void onPostExecute(Bitmap result){
 			if(result==null){
 			}else{
-				ImageView cover	= (ImageView)findViewById(R.id.AlbumCover);
-				cover.setImageBitmap(result);
+				// Get cover id
+				Track track	= Player.GetInstance().GetCurrentTrack();
+				if(track!=null){
+					String currentThumbnailString		= track.metadata.get("thumbnail_id");
+					if(currentThumbnailString!=null){
+						if(this.thumbString.equals(currentThumbnailString)){
+							ImageView cover	= (ImageView)findViewById(R.id.AlbumCover);
+							cover.setImageBitmap(result);
+						}
+					}
+				}
 			}
 		}
 	}