--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/09/29 23:05:14	1144
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2011/05/28 17:39:31	1486
@@ -23,6 +23,7 @@
 import static dk.thoerup.traininfo.R.string.stationlist_nostations;
 import static dk.thoerup.traininfo.R.string.stationlist_obtainedby;
 import static dk.thoerup.traininfo.R.string.stationlist_removefavorite;
+import static dk.thoerup.traininfo.R.string.stationlist_satellitecount;
 import static dk.thoerup.traininfo.R.string.stationlist_search;
 import static dk.thoerup.traininfo.R.string.stationlist_stationadded;
 import static dk.thoerup.traininfo.R.string.stationlist_stationmap;
@@ -30,7 +31,6 @@
 import static dk.thoerup.traininfo.R.string.stationlist_stationsearch;
 import static dk.thoerup.traininfo.R.string.stationlist_twocharmin;
 import static dk.thoerup.traininfo.R.string.stationlist_waitforlocation;
-import static dk.thoerup.traininfo.R.string.stationlist_satellitecount;
 
 import java.util.ArrayList;
 
@@ -48,19 +48,20 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View.OnCreateContextMenuListener;
 import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Toast;
 import dk.thoerup.android.traininfo.common.StationBean;
-import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
+import dk.thoerup.android.traininfo.common.StationEntry;
 import dk.thoerup.traininfo.provider.ProviderFactory;
 import dk.thoerup.traininfo.provider.StationProvider;
 import dk.thoerup.traininfo.stationmap.GeoPair;
@@ -72,8 +73,8 @@
 
 	
 	
-	public static final int OPTIONS_MAP = 2003;
-	public static final int OPTIONS_GPSINFO = 2004;
+	public static final int OPTIONS_MAP = 103;
+	public static final int OPTIONS_GPSINFO = 104;
 	
 	public static final int DLG_PROGRESS = 3001;
 	public static final int DLG_STATIONNAME = 3002;
@@ -149,7 +150,7 @@
 			
 			switch (listType) {
 			case ListNearest:
-				startLookup();
+				startNearestLookup();
 				break;
 			case ListSearch:				
 				showDialog(DLG_STATIONNAME); 
@@ -177,6 +178,8 @@
 	protected void onDestroy() {
 		super.onDestroy();
 		
+		stationsFetched.removeMessages(0);
+		
 		
 		if (locationLookup != null) {
 			locationLookup.stopSearch();
@@ -228,19 +231,29 @@
 		item.setIcon(android.R.drawable.ic_menu_mapmode);
 		
 		item = menu.add(0, OPTIONS_GPSINFO, 0, getString(stationlist_gpsinfo));
-		item.setIcon(android.R.drawable.ic_menu_mapmode);		
+		item.setIcon(android.R.drawable.ic_menu_info_details);
+		boolean hasLoc = (locationLookup.getLocation() != null);
+		item.setEnabled(hasLoc);
 		
 		return true;
 	}
+	
+
+
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		boolean retval = true;
 
-		//TODO: Cleanup
+
 		switch (item.getItemId()) {
 		case OPTIONS_MAP:
 			
+			if ( stations == null || stations.entries == null || stations.entries.size() == 0 ) {
+				Toast.makeText(this, "No stations to show on map", Toast.LENGTH_SHORT).show(); //TODO: Translate
+				return true;
+			}
+			
 			Intent intent = new Intent(this,StationMapView.class);
 			
 			ArrayList<GeoPair> stationPoints = new ArrayList<GeoPair>();
@@ -256,14 +269,12 @@
 			Location loc = locationLookup.getLocation();
 			StringBuffer message = new StringBuffer();
 			message.append( getString(stationlist_locationinfo) ).append(":\n");
-			if (loc != null) {
-				message.append( getString(stationlist_obtainedby) ).append( loc.getProvider() ).append("\n");
-				message.append( getString(stationlist_accuracy) ).append( (int)loc.getAccuracy()).append("m\n");
-				message.append( getString(stationlist_latitude) ).append( (float)loc.getLatitude()).append("\n");
-				message.append( getString(stationlist_longitude) ).append( (float)loc.getLongitude() ).append("\n");
-			} else {
-				message.append( getString(stationlist_nolocation) );
-			}			
+			 
+			message.append( getString(stationlist_obtainedby) ).append( loc.getProvider() ).append("\n");
+			message.append( getString(stationlist_accuracy) ).append( (int)loc.getAccuracy()).append("m\n");
+			message.append( getString(stationlist_latitude) ).append( (float)loc.getLatitude()).append("\n");
+			message.append( getString(stationlist_longitude) ).append( (float)loc.getLongitude() ).append("\n");
+						
 			
 			MessageBox.showMessage(this, message.toString(), false);
 			break;
@@ -324,7 +335,7 @@
 					dialog.dismiss();
 					String search = et.getText().toString().trim();
 					if (search.length() >= 2) {
-						startNameSearch(search);
+						startNameLookup(search);
 					} else {
 						showMessageAndClose( getString(stationlist_twocharmin) );
 					}
@@ -380,7 +391,7 @@
 	/////////////////////////////////////////////////////////////
 	//
 
-	public void startLookup() {
+	public void startNearestLookup() {
 		dialogMessage = getString( stationlist_waitforlocation );
 		showDialog(DLG_PROGRESS);
 		
@@ -388,7 +399,7 @@
 		stationsFetched.sendEmptyMessageDelayed(0, 500);
 	}
 	
-	void startNameSearch(String name) {
+	void startNameLookup(String name) {
 		dialogMessage = getString( stationlist_findbyname );
 		showDialog(DLG_PROGRESS);
 
@@ -448,6 +459,11 @@
 				MessageBox.showMessage(StationList.this, getString(stationlist_nolocationprovider), true );
 				//StationList.this.finish();
 				return;
+			case IDLE:
+				Log.e("TrainInfo", "How did this happen ???");
+				dismissDialog(DLG_PROGRESS); // how did we get here ??
+				return;
+				
 			}
 
 
@@ -455,6 +471,7 @@
 			if (locationLookup.elapsedTime() >=  GPS_TIMEOUT_MS) {
 				dismissDialog(DLG_PROGRESS);
 
+
 				locationLookup.stopSearch();
 
 				if (locationLookup.hasLocation()) {
@@ -466,13 +483,14 @@
 					builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() {
 						public void onClick(DialogInterface dialog, int id) {
 							dialog.dismiss();
-							startLookup();
+							startNearestLookup();
 
 						}
 					});
 					builder.setNegativeButton( getString(generic_cancel), new DialogInterface.OnClickListener() {
 						public void onClick(DialogInterface dialog, int id) {
 							dialog.dismiss();
+							StationList.this.finish(); // Close this Activity
 						}							
 					});
 					builder.show(); 
@@ -530,7 +548,7 @@
 
 			switch (method) {
 			case ByLocation:
-				stations = stationProvider.lookupStations(loc);
+				stations = stationProvider.lookupStationsByLocation(loc);
 				break;
 			case ByName:
 				stations = stationProvider.lookupStationsByName(name);
@@ -583,7 +601,7 @@
 							runner = new Runnable() {
 								@Override
 								public void run() {
-									startNameSearch( FindStationsTask.this.name );
+									startNameLookup( FindStationsTask.this.name );
 								}
 							};
 							break;