--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadActivity.java	Mon Nov 14 17:59:26 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadActivity.java	Mon Nov 14 18:03:31 2011 +0100
@@ -114,7 +114,7 @@
 	private OnClickListener cancelClicker = new OnClickListener(){
 		public void onClick(View v){
 			Intent i = new Intent(getApplicationContext(), DownloadService.class);
-			i.putExtra("taskID", DownloadService.TASKID_CANCEL);
+			i.putExtra(DownloadService.INTENT_TASKID, DownloadService.TASKID_CANCEL);
 			startService(i);
 			finish();
 		}
@@ -128,13 +128,13 @@
 	
 	private OnClickListener tryAgainClicker = new OnClickListener(){
 		public void onClick(View v){
-			bindToService(DownloadService.TASKID_RETRY);
+			bindToService(DownloadService.TASKID_ADDTASK);
 		}
 	};
 	
 	public void onStart(){
 		super.onStart();
-		bindToService(DownloadService.TASKID_START);
+		bindToService(DownloadService.TASKID_SETUP);
 	}
 	
 	public void onStop(){
@@ -163,7 +163,7 @@
 	
 	private void bindToService(int taskId){
 		Intent i = new Intent(getApplicationContext(), DownloadService.class);
-		i.putExtra("taskID", taskId);
+		i.putExtra(DownloadService.INTENT_TASKID, taskId);
 		startService(i);
 		bindService(new Intent(getApplicationContext(), DownloadService.class), connection, Context.BIND_AUTO_CREATE);
 		boundToService = true;