--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/08/09 19:40:05	245
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/09/23 12:51:49	336
@@ -1,21 +1,27 @@
 package dk.thoerup.traininfo;
 
 import java.text.NumberFormat;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
+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.location.Address;
+import android.location.Geocoder;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
-import dk.thoerup.traininfo.provider.DepartureFactory;
 import dk.thoerup.traininfo.provider.DepartureProvider;
+import dk.thoerup.traininfo.provider.ProviderFactory;
 import dk.thoerup.traininfo.util.MessageBox;
 
 public class DepartureList extends ListActivity {
@@ -27,15 +33,17 @@
 	DepartureProvider provider;
 	List<DepartureBean> departures;
 	
-	static int itemId;
-	static DepartureBean currentDeparture;
+	int selectedItemId;
+	//DepartureBean currentDeparture;
 	
 	ProgressDialog pgDialog;
-	
+	Dialog detailsDialog;
 	DepartureFetcher fetcher;
+	int stationId;
 	
 	double latitude,longitude;
 	
+	@SuppressWarnings("unchecked")
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -51,9 +59,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 );
+		stationId = launchedBy.getIntExtra("stationid", -1); 
 		
 		findViewById(R.id.header).setOnClickListener( mapLauncher );
 		
@@ -64,25 +74,40 @@
 		((TextView) findViewById(R.id.stationDistance)).setText( format.format((double)distance/1000.0) + " km." );
 	
 		
-		showDialog(DLG_PROGRESS);
-		provider = DepartureFactory.getProvider();
+		provider = ProviderFactory.getDepartureProvider();
 		
-		fetcher = new DepartureFetcher();
-		fetcher.execute(name);
+		if (savedInstanceState == null) {
+			startDepartureFetcher();
+		} else {
+			departures = (List<DepartureBean>) savedInstanceState.getSerializable("departures");
+			adapter.setDepartures(departures);
+			selectedItemId = savedInstanceState.getInt("selectedItemId");	
+			boolean detailsShowing = savedInstanceState.getBoolean("detailsShowing");
+			if (detailsShowing)
+				showDialog(DLG_DETAILS);
+		}
 	}
 	
     @Override 
     public void onSaveInstanceState(Bundle outState) 
     {
-    	if (pgDialog.isShowing())
-    		pgDialog.dismiss();
+    	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);
     }
 	
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
 	
-		currentDeparture = departures.get(position);
+		selectedItemId = position;		
 		showDialog(DLG_DETAILS);		
 	}
 	
@@ -90,16 +115,19 @@
 	@Override
 	protected void onPrepareDialog(int id, Dialog dialog) {
 		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;
@@ -131,6 +159,12 @@
 		}
 	}
 
+	void startDepartureFetcher() {
+		showDialog(DLG_PROGRESS);
+		fetcher = new DepartureFetcher(); 
+		fetcher.execute(stationId);
+	}
+	
 	class DialogDismisser implements View.OnClickListener {
 
 		Dialog dlg;
@@ -143,7 +177,9 @@
 			if (dlg.isShowing())
 				dlg.dismiss();
 		}
-	}
+
+	
+}
 	
 	View.OnClickListener mapLauncher = new View.OnClickListener() {
 		@Override
@@ -152,25 +188,49 @@
 			startActivity( new Intent(Intent.ACTION_VIEW, uri));
 		}
 	};
+
+
 	
-	
-	class DepartureFetcher extends AsyncTask<String, Void, Void> {
+	class DepartureFetcher extends AsyncTask<Integer, Void, Void> {
 
+		boolean success;
+		String addr;
 		@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(String... params) {
-			provider.lookupDepartures(params[0]);
-			departures = provider.getDepartures();
+		protected Void doInBackground(Integer... params) {
+			success = provider.lookupDepartures(params[0]);
+			departures = provider.getDepartures(params[0]);
 			return null;
 		}