--- android/TrainInfo/src/dk/thoerup/traininfo/TrainInfoList.java	2009/08/10 18:48:24	257
+++ android/TrainInfo/src/dk/thoerup/traininfo/TrainInfoList.java	2009/08/10 19:37:18	258
@@ -1,5 +1,8 @@
 package dk.thoerup.traininfo;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import android.app.Dialog;
 import android.app.ListActivity;
 import android.app.ProgressDialog;
@@ -8,6 +11,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+
 import android.view.View;
 import android.widget.ListView;
 import dk.thoerup.traininfo.util.MessageBox;
@@ -26,9 +30,12 @@
 	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);
@@ -41,15 +48,20 @@
 		setListAdapter(adapter);
 		
 		locator = new StationLocator(this, stationsFetched);
-		
-		startLookup();
+		if (savedInstanceState == null) {
+			startLookup();
+		} else {
+			stations = (ArrayList<StationBean>) savedInstanceState.getSerializable("stations");
+			adapter.setStations(new ArrayList<StationBean>(stations));
+		}
 	}
 	
     @Override 
     public void onSaveInstanceState(Bundle outState) 
     {
-    	if (dialog.isShowing())
+    	if (dialog != null && dialog.isShowing())
     		dialog.dismiss();
+    	outState.putSerializable("stations", (ArrayList<StationBean>) stations);
     }
 	
 	
@@ -85,14 +97,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");
@@ -102,7 +113,8 @@
 				dialog.dismiss();
 				if (locator.getStations().size() == 0)
 					MessageBox.showMessage(TrainInfoList.this,"Error loading station list!");
-				adapter.setStations( locator.getStations() );
+				stations = locator.getStations();
+				adapter.setStations( stations );
 				break;
 			case NOPROVIDER:
 				dialog.dismiss();
@@ -120,7 +132,6 @@
 				MessageBox.showMessage(TrainInfoList.this,"Error on finding nearby stations");
 				break;
 			}
-			
 			isRunning = false;
 		}
 	};
@@ -131,7 +142,8 @@
 	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);
 		
 		
 		Intent intent = new Intent(this, DepartureList.class);
@@ -147,18 +159,21 @@
 	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