--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/07/11 14:58:13	982
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/08/03 06:12:10	1007
@@ -19,11 +19,9 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.ListView;
@@ -124,7 +122,10 @@
 				startDepartureFetcher();
 			} else {
 				departures = (DepartureBean) savedInstanceState.getSerializable("departures");
-				adapter.setDepartures(departures.entries);
+				
+				if ( (departures != null) && (departures.entries != null) ) {
+					adapter.setDepartures(departures.entries);
+				}
 				selectedItemId = savedInstanceState.getInt("selectedItemId");
 				
 				if ( hasNotifications() ) {
@@ -210,10 +211,11 @@
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuItem item;
-		item = menu.add(0, MENU_MAP, 0, "Show on map");
+		
+		item = menu.add(0, MENU_MAP, 0, getString(R.string.departurelist_showonmap) );
 		item.setIcon(android.R.drawable.ic_menu_mapmode);
 		
-		item = menu.add(0, MENU_NOTIFICATIONS, 0, "Notifications");
+		item = menu.add(0, MENU_NOTIFICATIONS, 0, getString(R.string.departurelist_notifications) );
 		item.setIcon(android.R.drawable.ic_menu_info_details);
 		
 		
@@ -277,7 +279,6 @@
 	
 	class DepartureFetcher extends AsyncTask<Integer, Void, Void> {
 
-		boolean success;
 
 		@Override
 		protected void onPostExecute(Void result) {
@@ -286,7 +287,7 @@
 			
 			pgDialog.dismiss();
 			
-			if (success) {
+			if (departures != null) {
 				DepartureList.this.getListView().setVisibility(View.GONE); //Experimental, inspired by http://osdir.com/ml/Android-Developers/2010-04/msg01198.html
 				adapter.setDepartures(departures.entries);
 				DepartureList.this.getListView().setVisibility(View.VISIBLE);
@@ -327,8 +328,7 @@
 
 		@Override
 		protected Void doInBackground(Integer... params) {
-			success = provider.lookupDepartures(params[0], DepartureList.this.arrival);
-			departures = provider.getDepartures(params[0], DepartureList.this.arrival);
+			departures = provider.lookupDepartures(params[0], DepartureList.this.arrival);
 			return null;
 		}