--- android/TrainInfo/src/dk/thoerup/traininfo/TrainInfoList.java	2009/08/09 11:48:36	242
+++ android/TrainInfo/src/dk/thoerup/traininfo/TrainInfoList.java	2009/09/11 08:48:18	316
@@ -1,17 +1,23 @@
 package dk.thoerup.traininfo;
 
-import android.app.AlertDialog;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
 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.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.view.View;
 import android.widget.ListView;
+import dk.thoerup.traininfo.util.MessageBox;
 
 public class TrainInfoList extends ListActivity  {
 	public static final int GOTLOCATION = 1;
@@ -27,24 +33,40 @@
 	StationLocator locator = null;
 	LocatorTask locatorTask = new LocatorTask();
 	
-	boolean isRunning;
-
+	boolean isRunning = false;
+	List<StationBean> stations = new ArrayList<StationBean>();
+	
+	
 	StationListAdapter adapter = null;
+	@SuppressWarnings("unchecked")
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.main);
 		
+		StationLocator.removeMockLocation(this);
 		//StationLocator.injectMockLocation(this);
 		
 		adapter = new StationListAdapter(this);
 		setListAdapter(adapter);
 		
 		locator = new StationLocator(this, stationsFetched);
-		
-		startLookup();
+		if (savedInstanceState == null) {
+			startLookup();
+		} else {
+			stations = (ArrayList<StationBean>) savedInstanceState.getSerializable("stations");
+			adapter.setStations(stations);
+		}
 	}
 	
+    @Override 
+    public void onSaveInstanceState(Bundle outState) 
+    {
+    	if (dialog != null && dialog.isShowing())
+    		dialog.dismiss();
+    	outState.putSerializable("stations", (ArrayList<StationBean>) stations);
+    }
+	
 	
 
 	@Override
@@ -78,14 +100,13 @@
 		showDialog(DLG_PROGRESS);
 		
 		locator.locateStations();
-		stationsFetched.sendEmptyMessageDelayed(FIXTIMEOUT, 20000);		
+		stationsFetched.sendEmptyMessageDelayed(FIXTIMEOUT, 20000);
 	}
 
 
 	Handler stationsFetched = new Handler() {
 		@Override
 		public void handleMessage(Message msg) {
-			
 			switch (msg.what) {
 			case GOTLOCATION:
 				dialog.setMessage("Finding nearby stations");
@@ -93,25 +114,32 @@
 				break;
 			case GOTSTATIONLIST:
 				dialog.dismiss();
-				adapter.setStations( locator.getStations() );
+				if (locator.getStations().size() == 0)
+					MessageBox.showMessage(TrainInfoList.this,"Error loading station list!");
+				stations = locator.getStations();
+				adapter.setStations( stations );
 				break;
 			case NOPROVIDER:
 				dialog.dismiss();
-				showMessageBox("No location provider enabled. Plase enable gps.");
+				MessageBox.showMessage(TrainInfoList.this,"No location provider enabled. Plase enable gps.");
 				break;
 			case FIXTIMEOUT:
 				dialog.dismiss();
 				if (isRunning) {
 					locator.abortLocationListener();
-					showMessageBox("GPS fix timed out");
+					if (locator.hasLocation()) {
+						msg.what = GOTLOCATION;
+						handleMessage( msg ); // ToDo: ugly recursive call !!!
+					} else {
+						MessageBox.showMessage(TrainInfoList.this,"GPS fix timed out");
+					}
 				}
 				break;
 			case LOOKUPSTATIONFAILED:
 				dialog.dismiss();
-				showMessageBox("Error on finding nearby stations");
+				MessageBox.showMessage(TrainInfoList.this,"Error on finding nearby stations");
 				break;
 			}
-			
 			isRunning = false;
 		}
 	};
@@ -121,47 +149,43 @@
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
-		
-		StationBean station = adapter.getStation(position);
-		
+				
+		StationBean station = stations.get(position);
+
+		double latitude = station.getLatitude();
+		double longitude = station.getLongitude();
+
+
 		
 		Intent intent = new Intent(this, DepartureList.class);
 		intent.putExtra("name", station.getName());
-		intent.putExtra("address", station.getAddress());
 		intent.putExtra("distance", station.getDistance());
-		intent.putExtra("latitude", station.getLatitude());
-		intent.putExtra("longitude", station.getLongitude());
+		intent.putExtra("latitude", latitude);
+		intent.putExtra("longitude", longitude);
+		intent.putExtra("stationid", station.getId());
 		startActivity(intent);
 	}
 
-	public void showMessageBox(String message) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setMessage(message)
-		.setCancelable(false)
-		.setPositiveButton("OK", new DialogInterface.OnClickListener() {
-			public void onClick(DialogInterface dialog, int id) {
-				dialog.dismiss();
-			}
-		})
-		.show();
-
-	}
+	
 	
 	class LocatorTask extends AsyncTask<Void,Void,Void> {
 		@Override
 		protected void onPreExecute() {
+
 			super.onPreExecute();
 		}
 		
 		@Override
 		protected Void doInBackground(Void... params) {
 			locator.findNearestStations();
+			
 			return null;
 		}
 
 		@Override
 		protected void onPostExecute(Void result) {
 			super.onPostExecute(result);
+
 		}
 	}
 }
\ No newline at end of file