--- android/TrainInfo/src/dk/thoerup/traininfo/TimetableList.java	2009/09/30 10:20:05	366
+++ android/TrainInfo/src/dk/thoerup/traininfo/TimetableList.java	2010/06/11 17:39:11	839
@@ -1,24 +1,30 @@
 package dk.thoerup.traininfo;
 
 
+import static dk.thoerup.traininfo.R.string.generic_cancel;
+import static dk.thoerup.traininfo.R.string.generic_retry;
+import static dk.thoerup.traininfo.R.string.timetablelist_fetchdata;
+import static dk.thoerup.traininfo.R.string.timetablelist_fetcherror;
+import static dk.thoerup.traininfo.R.string.timetablelist_nodata;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.ListActivity;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.widget.ListView;
+import android.util.Log;
 import android.widget.TextView;
 import dk.thoerup.traininfo.provider.ProviderFactory;
 import dk.thoerup.traininfo.provider.TimetableProvider;
 import dk.thoerup.traininfo.util.MessageBox;
 
-public class TimetableList extends Activity {
+public class TimetableList extends ListActivity {
 	
 	private static final int DLG_PROGRESS = 8000;
 	DepartureBean departure;
@@ -36,10 +42,9 @@
 		
 		provider = ProviderFactory.getTimetableProvider();
 		
-		adapter = new TimetableListAdapter(this);
-		
-		ListView lv = (ListView) findViewById(R.id.List);
-		lv.setAdapter(adapter);
+		adapter = new TimetableListAdapter(this);		
+		setListAdapter(adapter);
+
 
 		
 		Intent launchedBy = getIntent();
@@ -47,8 +52,9 @@
 		
 		((TextView)findViewById(R.id.Train)).setText(departure.getTrainNumber());
 		((TextView)findViewById(R.id.Status)).setText(departure.getStatus());
+		((TextView)findViewById(R.id.Location)).setText(departure.getLocation());
 		((TextView)findViewById(R.id.Note)).setText(departure.getNote());
-		((TextView)findViewById(R.id.Updated)).setText(departure.getLastUpdateString());
+		((TextView)findViewById(R.id.Updated)).setText(departure.getLastUpdateString(this));
 						
 		
 		if (savedInstanceState == null) {
@@ -59,6 +65,7 @@
 		}
 	}
 	
+	
     @Override 
     public void onSaveInstanceState(Bundle outState) 
     {        	
@@ -66,20 +73,6 @@
     	outState.putSerializable("timetables", (ArrayList<TimetableBean>) timetables);
     }
 
-/* 		case DLG_DETAILS:
-			DepartureBean currentDeparture = departures.get(selectedItemId);
-			((TextView)dialog.findViewById(R.id.Time)).setText(currentDeparture.getTime());
-			((TextView)dialog.findViewById(R.id.Train)).setText(currentDeparture.getTrainNumber());
-			((TextView)dialog.findViewById(R.id.Destination)).setText( currentDeparture.getDestination());
-			((TextView)dialog.findViewById(R.id.Origin)).setText(currentDeparture.getOrigin());
-			((TextView)dialog.findViewById(R.id.Location)).setText(currentDeparture.getLocation());
-			((TextView)dialog.findViewById(R.id.Updated)).setText(currentDeparture.getLastUpdateString());
-			((TextView)dialog.findViewById(R.id.Status)).setText(currentDeparture.getStatus());
-			((TextView)dialog.findViewById(R.id.Note)).setText(currentDeparture.getNote());
-			detailsDialog = dialog;
-			break;
-
- */
 	
 	@Override
 	protected void onPrepareDialog(int id, Dialog dialog) {
@@ -96,8 +89,8 @@
 	protected Dialog onCreateDialog(int id) {
 		switch (id) {
 		case DLG_PROGRESS:
-			ProgressDialog dlg = new ProgressDialog(this);
-			dlg.setMessage("Fetch timetable data");
+			ProgressDialog dlg = new ProgressDialog(this);			
+			dlg.setMessage( getString(timetablelist_fetchdata) );
 			dlg.setCancelable(true);
 			return dlg;			
 		default:
@@ -108,7 +101,7 @@
 	void startTimetableFetcher() {
 		showDialog(DLG_PROGRESS);
 		fetcher = new TimetableFetcher(); 
-		fetcher.execute(departure.getTrainNumber());
+		fetcher.execute(departure.getType(), departure.getTrainNumber());
 	}
 	
 	class TimetableFetcher extends AsyncTask<String,Void,Void> {
@@ -124,34 +117,41 @@
 			if (success) {
 				adapter.setTimetable(timetables);
 				if (timetables.size() == 0) {
-					MessageBox.showMessage(TimetableList.this, "No timetable found");
+					MessageBox.showMessage(TimetableList.this, getString(timetablelist_nodata));
 				}
 			} else { // communication or parse error
 				AlertDialog.Builder builder = new AlertDialog.Builder(TimetableList.this);						
-				builder.setMessage("Error finding departures");
+				builder.setMessage(getString(timetablelist_fetcherror));
 				builder.setCancelable(true);
-				builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 						dialog.dismiss();
 						startTimetableFetcher();
 						
 					}
 				});
-				builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+				builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 						dialog.dismiss();
 					}							
-				});												
-				builder.show();				
+				});
+				
+				try {
+					builder.show();
+				} catch (android.view.WindowManager.BadTokenException e) {					
+					Log.i("TimetableList", "BadTokenException"); // this can happen if the user switched away from this activity, while doInBackground was running
+				}
+								
 			}
 			
 		}
 		
 		@Override
 		protected Void doInBackground(String... arg0) {
-			String trainID = arg0[0];
-			success = provider.lookupTimetable(trainID);
-			timetables = provider.getTimetable();
+			String type = arg0[0];
+			String trainID = arg0[1];
+			success = provider.lookupTimetable(type, trainID);
+			timetables = provider.getTimetable(type, trainID);
 			
 			return null;
 		}