--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/07/11 15:29:13	984
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/08/24 19:36:27	1017
@@ -51,7 +51,8 @@
 	StationBean station;
 	
 	boolean arrival = false;
-	
+
+	int commFailCounter = 0;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -122,7 +123,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() ) {
@@ -208,10 +212,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);
 		
 		
@@ -275,7 +280,6 @@
 	
 	class DepartureFetcher extends AsyncTask<Integer, Void, Void> {
 
-		boolean success;
 
 		@Override
 		protected void onPostExecute(Void result) {
@@ -284,7 +288,8 @@
 			
 			pgDialog.dismiss();
 			
-			if (success) {
+			if (departures != null) {
+				commFailCounter = 0;
 				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);
@@ -298,16 +303,19 @@
 					MessageBox.showMessage(DepartureList.this, "No departures found", true);
 				}
 			} else { // communication or parse error
+				commFailCounter++;
 				AlertDialog.Builder builder = new AlertDialog.Builder(DepartureList.this);						
 				builder.setMessage("Error finding departures");
 				builder.setCancelable(true);
-				builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() {
-					public void onClick(DialogInterface dialog, int id) {
-						dialog.dismiss();
-						startDepartureFetcher();
-						
-					}
-				});
+				if (commFailCounter < 3) {
+					builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog, int id) {
+							dialog.dismiss();
+							startDepartureFetcher();
+							
+						}
+					});
+				}
 				builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 						dialog.dismiss();
@@ -325,8 +333,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;
 		}