--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/02/02 08:44:35	578
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/04/20 14:17:34	652
@@ -18,6 +18,7 @@
 import android.os.Handler;
 import android.os.Message;
 
+import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -334,7 +335,7 @@
 		showDialog(DLG_PROGRESS);
 
 		findStationsTask = new FindStationsTask();
-		findStationsTask.searchByName(name, locationLookup.getLocation());
+		findStationsTask.searchByName(name);
 		findStationsTask.execute();
 		
 	}
@@ -346,7 +347,7 @@
 			showDialog(DLG_PROGRESS);
 
 			findStationsTask = new FindStationsTask();
-			findStationsTask.searchByIds(favorites.toString(), locationLookup.getLocation());
+			findStationsTask.searchByIds( favorites.toString() );
 			findStationsTask.execute();
 		} else {
 			showMessageAndClose( getString( stationlist_nofavorites ) );
@@ -428,10 +429,9 @@
 		Location loc;
 		String ids;
 		
-		public void searchByName(String n, Location l) {
+		public void searchByName(String n) {
 			
 			method = LookupMethod.ByName;
-			loc = l;
 			name = n;
 		}
 		
@@ -440,10 +440,9 @@
 			loc = l;
 		}
 		
-		public void searchByIds(String id, Location l) {
+		public void searchByIds(String id) {
 			
 			method = LookupMethod.ByList;
-			loc = l;
 			ids = id;
 		}
 		
@@ -473,23 +472,6 @@
 			}
 			
 			
-			Location dummy = new Location("gps");
-			List<StationBean> stations = stationProvider.getStations();
-			
-			for (StationBean station : stations) { 
-								
-				if (method.equals(LookupMethod.ByName) || method.equals(LookupMethod.ByList)) {
-					if (loc != null) { //only do the distance calc if we have a location
-						dummy.setLatitude(station.getLatitude());
-						dummy.setLongitude(station.getLongitude());
-						station.setDistance( (int)loc.distanceTo(dummy) );
-					} else {
-						station.setDistance(0);
-					}
-				}
-
-			}						
-			
 			return null;
 		}
 
@@ -514,20 +496,47 @@
 					public void onClick(DialogInterface dialog, int id) {
 						dialog.dismiss();
 						
-						stationsFetched.post( new Runnable() {
-							@Override
-							public void run() {
-								startLocatorTask();								
-							}
-						});
+						Runnable runner = null;
+						switch (method) {
+						case ByLocation:
+							runner = new Runnable() {
+								@Override
+								public void run() {
+									startLocatorTask();								
+								}
+							};
+							break;
+						case ByName:
+							runner = new Runnable() {
+								@Override
+								public void run() {
+									startNameSearch( FindStationsTask.this.name );
+								}
+							};
+							break;
+						case ByList:
+							runner = new Runnable() {
+								@Override
+								public void run() {
+									startFavoriteLookup();
+								}
+							};
+							break;
+						}
+						
+						stationsFetched.post( runner );
 					}
 				});
 				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("StationList", "BadTokenException"); // this can happen if the user switched away from this activity, while doInBackground was running
+				}
 			}
 		}
 	}