--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/09/10 19:09:09	310
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/01/26 21:17:26	552
@@ -4,9 +4,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+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.net.Uri;
 import android.os.AsyncTask;
@@ -21,7 +23,7 @@
 public class DepartureList extends ListActivity {
 
 	public static final int DLG_PROGRESS = 1;
-	public static final int DLG_DETAILS = 2;
+	
 	
 	DepartureListAdapter adapter;
 	DepartureProvider provider;
@@ -31,8 +33,9 @@
 	//DepartureBean currentDeparture;
 	
 	ProgressDialog pgDialog;
-	Dialog detailsDialog;
+	
 	DepartureFetcher fetcher;
+	int stationId;
 	
 	double latitude,longitude;
 	
@@ -52,11 +55,11 @@
 		
 		String name = launchedBy.getStringExtra("name");
 		((TextView) findViewById(R.id.stationName)).setText( name );
+
+		String address = launchedBy.getStringExtra("address");
+		((TextView) findViewById(R.id.stationAddr)).setText( address );
 		
-		String addr = launchedBy.getStringExtra("address");
-		((TextView) findViewById(R.id.stationAddr)).setText( addr );
-		
-		int stationId = launchedBy.getIntExtra("stationid", -1); 
+		stationId = launchedBy.getIntExtra("stationid", -1); 
 		
 		findViewById(R.id.header).setOnClickListener( mapLauncher );
 		
@@ -65,21 +68,26 @@
 		format.setMinimumFractionDigits(1);
 		int distance = launchedBy.getIntExtra("distance", 0);
 		((TextView) findViewById(R.id.stationDistance)).setText( format.format((double)distance/1000.0) + " km." );
-	
 		
-		provider = ProviderFactory.getDepartureProvider();
+		boolean isRegional = launchedBy.getBooleanExtra("isregional", false);
+		boolean isSTrain = launchedBy.getBooleanExtra("isstrain", false);
+		//boolean isMetro = launchedBy.getBooleanExtra("ismetro", false); // not currently used
 		
-		fetcher = new DepartureFetcher();
-		if (savedInstanceState == null) {
-			showDialog(DLG_PROGRESS);
-			fetcher.execute(stationId);
+	
+		if (isRegional == false && isSTrain == false) {
+			getListView().setVisibility( View.GONE );		
+			findViewById(R.id.metroonly).setVisibility( View.VISIBLE );
+			
 		} else {
-			departures = (List<DepartureBean>) savedInstanceState.getSerializable("departures");
-			adapter.setDepartures(departures);
-			selectedItemId = savedInstanceState.getInt("selectedItemId");	
-			boolean detailsShowing = savedInstanceState.getBoolean("detailsShowing");
-			if (detailsShowing)
-				showDialog(DLG_DETAILS);
+			provider = ProviderFactory.getDepartureProvider();
+			
+			if (savedInstanceState == null) {
+				startDepartureFetcher();
+			} else {
+				departures = (List<DepartureBean>) savedInstanceState.getSerializable("departures");
+				adapter.setDepartures(departures);
+				selectedItemId = savedInstanceState.getInt("selectedItemId");	
+			}
 		}
 	}
 	
@@ -88,11 +96,7 @@
     {
     	if (pgDialog != null && pgDialog.isShowing())
     		dismissDialog(DLG_PROGRESS);
-    	boolean detailsShowing = (detailsDialog != null && detailsDialog.isShowing()); 
-    	if (detailsShowing) {
-    		dismissDialog(DLG_DETAILS);
-    	}
-    	outState.putBoolean("detailsShowing", detailsShowing);
+
     	outState.putInt("selectedItemId", selectedItemId);
     	
     	outState.putSerializable("departures", (ArrayList<DepartureBean>) departures);
@@ -101,9 +105,16 @@
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
+		
+		selectedItemId = position;
+		
+		DepartureBean dep = departures.get(selectedItemId);
 	
-		selectedItemId = position;		
-		showDialog(DLG_DETAILS);		
+		Intent intent = new Intent(this, TimetableList.class);
+		intent.putExtra("departure", dep);
+		
+		startActivity(intent);
+				
 	}
 	
 
@@ -112,18 +123,6 @@
 		super.onPrepareDialog(id, dialog);
 		
 		switch (id) {
-		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;
 		case DLG_PROGRESS:
 			pgDialog = (ProgressDialog) dialog;
 			break;
@@ -137,23 +136,18 @@
 			ProgressDialog dlg = new ProgressDialog(this);
 			dlg.setMessage("Fetch departure data");
 			dlg.setCancelable(true);
-			return dlg;
-		case DLG_DETAILS:
-			//Context mContext = getApplicationContext();
-			Dialog dialog = new Dialog(this);
-			dialog.setCancelable(true);
-
-			dialog.setContentView(R.layout.departuredetails);
-			dialog.setTitle("Departure details");
-
-			View root = dialog.findViewById(R.id.layout_root);
-			root.setOnClickListener( new DialogDismisser(dialog) );
-			return dialog;			
+			return dlg;			
 		default:
 			return super.onCreateDialog(id);		
 		}
 	}
 
+	void startDepartureFetcher() {
+		showDialog(DLG_PROGRESS);
+		fetcher = new DepartureFetcher(); 
+		fetcher.execute(stationId);
+	}
+	
 	class DialogDismisser implements View.OnClickListener {
 
 		Dialog dlg;
@@ -165,7 +159,7 @@
 		public void onClick(View v) {
 			if (dlg.isShowing())
 				dlg.dismiss();
-		}
+		}	
 	}
 	
 	View.OnClickListener mapLauncher = new View.OnClickListener() {
@@ -175,25 +169,49 @@
 			startActivity( new Intent(Intent.ACTION_VIEW, uri));
 		}
 	};
-	
+
+
 	
 	class DepartureFetcher extends AsyncTask<Integer, Void, Void> {
 
+		boolean success;
+
 		@Override
 		protected void onPostExecute(Void result) {
 			super.onPostExecute(result);
 			
-			adapter.setDepartures(departures);
+			
 			pgDialog.dismiss();
 			
-			if (departures.size() == 0)
-				MessageBox.showMessage(DepartureList.this, "No departures found");
+			if (success) {
+				adapter.setDepartures(departures);
+				if (departures.size() == 0) {
+					MessageBox.showMessage(DepartureList.this, "No departures found");
+				}
+			} else { // communication or parse error
+				AlertDialog.Builder builder = new AlertDialog.Builder(DepartureList.this);						
+				builder.setMessage("Error finding departures");
+				builder.setCancelable(true);
+				builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() {
+					public void onClick(DialogInterface dialog, int id) {
+						dialog.dismiss();
+						startDepartureFetcher();
+						
+					}
+				});
+				builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+					public void onClick(DialogInterface dialog, int id) {
+						dialog.dismiss();
+					}							
+				});												
+				builder.show();				
+			}
 		}
 
 		@Override
 		protected Void doInBackground(Integer... params) {
-			provider.lookupDepartures(params[0]);
-			departures = provider.getDepartures();
+			success = provider.lookupDepartures(params[0]);
+			departures = provider.getDepartures(params[0]);
 			return null;
 		}