--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/07/12 16:09:39	990
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/09/08 06:25:13	1028
@@ -51,7 +51,8 @@
 	StationBean station;
 	
 	boolean arrival = false;
-	
+
+	int commFailCounter = 0;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -107,7 +108,8 @@
 		} else {
 			((TextView) findViewById(R.id.stationDistance)).setVisibility(View.GONE);
 		}
-		
+	
+		ProviderFactory.purgeOldEntries(); //cleanup before fetching more data
 	
 		if (station.isRegional() == false && station.isSTrain() == false) {
 			getListView().setVisibility( View.GONE );		
@@ -279,7 +281,6 @@
 	
 	class DepartureFetcher extends AsyncTask<Integer, Void, Void> {
 
-		boolean success;
 
 		@Override
 		protected void onPostExecute(Void result) {
@@ -288,7 +289,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);
@@ -302,16 +304,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();
@@ -329,8 +334,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;
 		}