--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2010/08/25 06:18:13 1019 +++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2010/09/28 14:58:45 1142 @@ -1,8 +1,38 @@ package dk.thoerup.traininfo; -import java.util.ArrayList; -import java.util.List; +import static dk.thoerup.traininfo.R.string.app_name; +import static dk.thoerup.traininfo.R.string.generic_cancel; +import static dk.thoerup.traininfo.R.string.generic_retry; +import static dk.thoerup.traininfo.R.string.generic_search; +import static dk.thoerup.traininfo.R.string.stationlist_accuracy; +import static dk.thoerup.traininfo.R.string.stationlist_addfavorite; +import static dk.thoerup.traininfo.R.string.stationlist_favorites; +import static dk.thoerup.traininfo.R.string.stationlist_fetcherror; +import static dk.thoerup.traininfo.R.string.stationlist_findbyname; +import static dk.thoerup.traininfo.R.string.stationlist_findingnearby; +import static dk.thoerup.traininfo.R.string.stationlist_gpsinfo; +import static dk.thoerup.traininfo.R.string.stationlist_gpstimeout; +import static dk.thoerup.traininfo.R.string.stationlist_latitude; +import static dk.thoerup.traininfo.R.string.stationlist_loadfavorites; +import static dk.thoerup.traininfo.R.string.stationlist_locationinfo; +import static dk.thoerup.traininfo.R.string.stationlist_longitude; +import static dk.thoerup.traininfo.R.string.stationlist_nearbystations; +import static dk.thoerup.traininfo.R.string.stationlist_nofavorites; +import static dk.thoerup.traininfo.R.string.stationlist_nolocation; +import static dk.thoerup.traininfo.R.string.stationlist_nolocationprovider; +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_search; +import static dk.thoerup.traininfo.R.string.stationlist_stationadded; +import static dk.thoerup.traininfo.R.string.stationlist_stationmap; +import static dk.thoerup.traininfo.R.string.stationlist_stationremoved; +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; import android.app.Activity; import android.app.AlertDialog; @@ -18,7 +48,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; - +import android.util.Log; import android.view.ContextMenu; import android.view.LayoutInflater; import android.view.Menu; @@ -30,6 +60,8 @@ 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.traininfo.provider.ProviderFactory; import dk.thoerup.traininfo.provider.StationProvider; import dk.thoerup.traininfo.stationmap.GeoPair; @@ -37,13 +69,15 @@ import dk.thoerup.traininfo.util.IntSet; import dk.thoerup.traininfo.util.MessageBox; -import static dk.thoerup.traininfo.R.string.*; - public class StationList extends ListActivity { - public static final int GOTLOCATION = 1001; - public static final int GOTSTATIONLIST = 1002; - public static final int NOPROVIDER = 1003; - public static final int LOCATIONFIXTIMEOUT = 1004; + public enum LookupStates { + GOTLOCATION, + GOTSTATIONLIST, + NOPROVIDER, + LOCATIONFIXTIMEOUT, + GPS_SAT_COUNT + } + public static final int OPTIONS_MAP = 2003; public static final int OPTIONS_GPSINFO = 2004; @@ -73,7 +107,7 @@ boolean isLaunchedforShortcut; boolean isRunning = false; - List stations = new ArrayList(); + StationBean stations = new StationBean(); StationProvider stationProvider = ProviderFactory.getStationProvider(); @@ -88,7 +122,7 @@ /////////////////////////////////////////////////////////////////////////////////////////// //Activity call backs - @SuppressWarnings("unchecked") + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -115,6 +149,8 @@ isLaunchedforShortcut = getIntent().getBooleanExtra("shortcut", false); + ProviderFactory.purgeOldEntries(); //cleanup before fetching more data + if (savedInstanceState == null) { @@ -133,25 +169,30 @@ } } else { - stations = (ArrayList) savedInstanceState.getSerializable("stations"); + stations = (StationBean) savedInstanceState.getSerializable("stations"); adapter.setStations(stations); location = (GeoPair) savedInstanceState.getSerializable("location"); } } + + + + @Override protected void onDestroy() { super.onDestroy(); - if (findStationsTask != null) { - findStationsTask.cancel(true); - } + isRunning = false; + if (locationLookup != null) { locationLookup.stopSearch(); } - isRunning = false; + if (findStationsTask != null) { + findStationsTask.cancel(true); + } } @@ -182,7 +223,7 @@ { if (dialog != null && dialog.isShowing()) dialog.dismiss(); - outState.putSerializable("stations", (ArrayList) stations); + outState.putSerializable("stations", (StationBean) stations); outState.putSerializable("location", location); } @@ -213,7 +254,7 @@ Intent intent = new Intent(this,StationMapView.class); ArrayList stationPoints = new ArrayList(); - for (StationBean st : stations ) { + for (StationEntry st : stations.entries ) { stationPoints.add( new GeoPair(st.getLatitude(), st.getLongitude(), st.getName()) ); } @@ -332,7 +373,7 @@ protected void onListItemClick(ListView l, View v, int position, long id) { super.onListItemClick(l, v, position, id); - StationBean station = stations.get(position); + StationEntry station = stations.entries.get(position); if (isLaunchedforShortcut == true) { Intent i = new Intent(); @@ -355,7 +396,7 @@ showDialog(DLG_PROGRESS); locationLookup.locateStations(); - stationsFetched.sendEmptyMessageDelayed(LOCATIONFIXTIMEOUT, GPS_TIMEOUT_MS); + stationsFetched.sendEmptyMessageDelayed(LookupStates.LOCATIONFIXTIMEOUT.ordinal(), GPS_TIMEOUT_MS); } void startNameSearch(String name) { @@ -401,8 +442,11 @@ class StationsFetchedHandler extends Handler { @Override public void handleMessage(Message msg) { + Log.e("Handler", "WHAT:" + msg.what); + + LookupStates state = LookupStates.values()[msg.what]; - switch (msg.what) { + switch (state) { case GOTLOCATION: dismissDialog(DLG_PROGRESS); @@ -416,11 +460,16 @@ MessageBox.showMessage(StationList.this, getString(stationlist_nolocationprovider), true ); //StationList.this.finish(); break; + case GPS_SAT_COUNT: + int count = msg.arg1; + String dialogMessage = getString( stationlist_waitforlocation ) + "\n" + getString( stationlist_satellitecount ) + ": " + count; + dialog.setMessage( dialogMessage ); + return; //abort immediately case LOCATIONFIXTIMEOUT: if (isRunning) { locationLookup.stopSearch(); if (locationLookup.hasLocation()) { - stationsFetched.sendEmptyMessage( GOTLOCATION ); + stationsFetched.sendEmptyMessage( LookupStates.GOTLOCATION.ordinal() ); } else { dismissDialog(DLG_PROGRESS); @@ -510,7 +559,7 @@ if (stations != null) { - if (stations.size() == 0) { + if (stations.entries.size() == 0) { showMessageAndClose(getString(stationlist_nostations)); } @@ -582,7 +631,7 @@ AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo; selectedPosition = info.position; - int stationID = stations.get(selectedPosition).getId(); + int stationID = stations.entries.get(selectedPosition).getId(); if (!favorites.contains(stationID)) { menu.add(0, FAVORITES_ADD, 0, getString(stationlist_addfavorite) ); @@ -593,7 +642,7 @@ } public void onContextItemSelected(MenuItem item) { - StationBean sb = stations.get(selectedPosition); + StationEntry sb = stations.entries.get(selectedPosition); int stationID = sb.getId(); if (item.getItemId() == FAVORITES_ADD) { @@ -606,7 +655,7 @@ if (listType.equals( WelcomeScreen.ListType.ListFavorites) ) { - stations.remove(selectedPosition); + stations.entries.remove(selectedPosition); adapter.notifyDataSetChanged(); } }