--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/06/26 10:50:34	917
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/08/31 08:49:15	1025
@@ -19,7 +19,6 @@
 import android.os.Handler;
 import android.os.Message;
 
-import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -48,13 +47,14 @@
 	
 	public static final int OPTIONS_MAP = 2003;
 	public static final int OPTIONS_GPSINFO = 2004;
-
-	
-
 	
 	public static final int DLG_PROGRESS = 3001;
 	public static final int DLG_STATIONNAME = 3002;
 	
+	
+	public static final int GPS_TIMEOUT_MS = 15000; //how long are we willing to wait for gps fix -in milliseconds
+	
+	
 	static enum LookupMethod {
 		ByLocation,
 		ByName,
@@ -122,8 +122,8 @@
 			case ListNearest:
 				startLookup();
 				break;
-			case ListSearch:
-				this.showDialogSafe(DLG_STATIONNAME);
+			case ListSearch:				
+				showDialog(DLG_STATIONNAME); 
 				break;
 			case ListFavorites:
 				startFavoriteLookup();
@@ -139,6 +139,23 @@
 		}
 		
 	}
+	
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		
+		isRunning = false;
+		
+		if (locationLookup != null) {
+			locationLookup.stopSearch();
+		}
+		if (findStationsTask != null) {
+			findStationsTask.cancel(true);
+		}		
+	}
+
+	
 	protected void setTitle() {
 		String dialogTitle = getResources().getString(app_name);
 		switch (listType) {
@@ -159,47 +176,7 @@
 		
 	}
 	
-	
-	/* these 3 dialogs helper functions are very rude and ugly hack
-	 * to remove these auto-reported exceptions 
-	 * - android.view.WindowManager$BadTokenException: Unable to add window -- token android.os.BinderProxy@436aaef8 is not valid; is your activity running?
-	 * - java.lang.IllegalArgumentException: View not attached to window manager 
-	 */
-	
-	public void showDialogSafe(int id) {
-		try {
-			showDialog(id);
-		} catch (Exception e) {
-			Log.e("StationList", "showDialog failed", e);
-		}
-	}
-	
-	public void dismissDialogSafe(int id) {
-		try {
-			dismissDialog(id);
-		} catch (Exception e) {
-			Log.e("StationList", "dismissDialog failed", e);
-		}
-	}
-	public void dismissDialogSafe(Dialog dlg) {
-		try {
-			dlg.dismiss();
-		} catch (Exception e) {
-			Log.e("StationList", "dismissDialog failed", e);
-		}
-	}
-	
-	public void builderShowSafe(AlertDialog.Builder builder) {
-		try {
-			builder.show();
-		} catch (Exception e) {
-			Log.e("StationList", "builder.show() failed", e);
-		}
 		
-	}
-	/* EOF rude and ugly dialog hack */
-	
-
 
     @Override 
     public void onSaveInstanceState(Bundle outState) 
@@ -376,15 +353,15 @@
 	public void startLookup() {
 		isRunning = true;		
 		dialogMessage = getString( stationlist_waitforlocation );
-		showDialogSafe(DLG_PROGRESS);
+		showDialog(DLG_PROGRESS);
 		
 		locationLookup.locateStations();
-		stationsFetched.sendEmptyMessageDelayed(LOCATIONFIXTIMEOUT, 20000);
+		stationsFetched.sendEmptyMessageDelayed(LOCATIONFIXTIMEOUT, GPS_TIMEOUT_MS);
 	}
 	
 	void startNameSearch(String name) {
 		dialogMessage = getString( stationlist_findbyname );
-		showDialogSafe(DLG_PROGRESS);
+		showDialog(DLG_PROGRESS);
 
 		findStationsTask = new FindStationsTask();
 		findStationsTask.searchByName(name);
@@ -396,7 +373,7 @@
 		
 		if (favorites.size() > 0) {
 			dialogMessage = getString( stationlist_loadfavorites );
-			showDialogSafe(DLG_PROGRESS);
+			showDialog(DLG_PROGRESS);
 
 			findStationsTask = new FindStationsTask();
 			findStationsTask.searchByIds( favorites.toString() );
@@ -411,7 +388,7 @@
 	void startLocatorTask()
 	{
 		dialogMessage = getString( stationlist_findingnearby ); 
-		showDialogSafe(DLG_PROGRESS);
+		showDialog(DLG_PROGRESS);
 		
 		findStationsTask = new FindStationsTask();
 		findStationsTask.searchByLocation( locationLookup.getLocation() );
@@ -428,7 +405,7 @@
 
 			switch (msg.what) {
 			case GOTLOCATION:
-				dismissDialogSafe(DLG_PROGRESS);
+				dismissDialog(DLG_PROGRESS);
 				
 				startLocatorTask();
 				location = GeoPair.fromLocation( locationLookup.getLocation() );
@@ -436,7 +413,7 @@
 				break;
 
 			case NOPROVIDER:
-				dismissDialogSafe(DLG_PROGRESS);
+				dismissDialog(DLG_PROGRESS);
 				MessageBox.showMessage(StationList.this, getString(stationlist_nolocationprovider), true );
 				//StationList.this.finish();
 				break;
@@ -446,7 +423,7 @@
 					if (locationLookup.hasLocation()) {
 						stationsFetched.sendEmptyMessage( GOTLOCATION ); 
 					} else {						
-						dismissDialogSafe(DLG_PROGRESS);
+						dismissDialog(DLG_PROGRESS);
 						
 						AlertDialog.Builder builder = new AlertDialog.Builder(StationList.this);						
 						builder.setMessage(  getString( stationlist_gpstimeout) );
@@ -463,7 +440,7 @@
 								dialog.dismiss();
 							}							
 						});
-						builderShowSafe(builder); // builder.show()
+						builder.show(); 
 
 					}
 				}
@@ -477,7 +454,6 @@
 	class FindStationsTask extends AsyncTask<Void,Void,Void> {
 		
 		LookupMethod method = LookupMethod.MethodNone;
-		boolean success;
 		String name;
 		Location loc;
 		String ids;
@@ -512,16 +488,16 @@
 
 			switch (method) {
 			case ByLocation:
-				success = stationProvider.lookupStations(loc);
+				stations = stationProvider.lookupStations(loc);
 				break;
 			case ByName:
-				success = stationProvider.lookupStationsByName(name);
+				stations = stationProvider.lookupStationsByName(name);
 				break;
 			case ByList:
-				success = stationProvider.lookupStationsByIds(ids);
+				stations = stationProvider.lookupStationsByIds(ids);
 				break;
 			default:
-				success = false; // not possible	
+				stations = null; // not possible	
 			}
 			
 			
@@ -531,14 +507,13 @@
 		@Override
 		protected void onPostExecute(Void result) {
 			super.onPostExecute(result);
-			dismissDialogSafe(dialog);
+			dialog.dismiss();
 			
 			
-			if (success) {				
-				if (stationProvider.getStations().size() == 0) {
+			if (stations != null) {				
+				if (stations.size() == 0) {
 					showMessageAndClose(getString(stationlist_nostations));
 				}
-				stations = stationProvider.getStations();
 
 				StationList.this.getListView().invalidateViews();
 				adapter.setStations( stations );				
@@ -590,7 +565,7 @@
 					}							
 				});
 				
-				builderShowSafe(builder); // builder.show()
+				builder.show(); 
 			}
 		}
 	}