--- android/TrainInfo/src/dk/thoerup/traininfo/WelcomeScreen.java	2011/07/07 20:42:03	1550
+++ android/TrainInfo/src/dk/thoerup/traininfo/WelcomeScreen.java	2011/07/08 12:24:48	1555
@@ -2,14 +2,13 @@
 
 
 
-import java.util.ArrayList;
+import java.io.InvalidClassException;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
-import android.location.Location;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -25,14 +24,11 @@
 
 import com.nullwire.trace.ExceptionHandler;
 
-import dk.thoerup.android.traininfo.common.StationEntry;
 import dk.thoerup.androidutils.CheckUpdates;
 import dk.thoerup.traininfo.provider.OfflineStationProvider;
 import dk.thoerup.traininfo.provider.ProviderFactory;
 import dk.thoerup.traininfo.provider.StationProvider;
-import dk.thoerup.traininfo.stationmap.GeoPair;
-import dk.thoerup.traininfo.stationmap.StationMapView;
-import dk.thoerup.traininfo.util.MessageBox;
+
 
 public class WelcomeScreen extends Activity{
 	
@@ -92,27 +88,32 @@
 		
 		if (sp instanceof OfflineStationProvider ) {
 			OfflineStationProvider osp = (OfflineStationProvider) sp;
-			try {
-				
-				long last = prefs.getLong(stationsreload, 0);
-				long now = System.currentTimeMillis();
+			long last = prefs.getLong(stationsreload, 0);
+			long now = System.currentTimeMillis();
+			Log.i("TrainInfo", "Last Load: " + last);
+			
+			if ( (now-last) > (14*24*60*60*1000) ) {
+				new StationLoader(osp).execute( (Void)null);
+			} else {
+			
+				boolean didLoad = false;
 				
-				Log.i("TrainInfo", "Last Load: " + last);
+				try {
+					didLoad = osp.loadStations(this);
+				} 
+				catch (InvalidClassException e) {
+					Log.i("TrainInfo", "invalid class - do a new download of stationlist");
+				}
+				catch (Exception e) {
+					Toast.makeText(this, "" + e.getMessage(), Toast.LENGTH_SHORT).show();
+					Log.e("TrainInfo", "load error", e);
+				}
 				
-				if ( (now-last) > (14*24*60*60*1000) ) {
+				if (didLoad == false) {					
 					new StationLoader(osp).execute( (Void)null);
-				} else {
-				
-					boolean didLoad = osp.loadStations(this);
-					
-					if (didLoad == false) {					
-						new StationLoader(osp).execute( (Void)null);
-					}
 				}
-				
-			} catch (Exception e) {
-				Toast.makeText(this, "" + e.getMessage(), Toast.LENGTH_SHORT).show();
 			}
+
 		}
 	}