--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java 2009/09/30 09:14:27 365 +++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java 2010/01/26 21:17:26 552 @@ -13,7 +13,6 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.widget.ListView; import android.widget.TextView; @@ -69,16 +68,26 @@ format.setMinimumFractionDigits(1); int distance = launchedBy.getIntExtra("distance", 0); ((TextView) findViewById(R.id.stationDistance)).setText( format.format((double)distance/1000.0) + " km." ); - - provider = ProviderFactory.getDepartureProvider(); + boolean isRegional = launchedBy.getBooleanExtra("isregional", false); + boolean isSTrain = launchedBy.getBooleanExtra("isstrain", false); + //boolean isMetro = launchedBy.getBooleanExtra("ismetro", false); // not currently used - if (savedInstanceState == null) { - startDepartureFetcher(); + + if (isRegional == false && isSTrain == false) { + getListView().setVisibility( View.GONE ); + findViewById(R.id.metroonly).setVisibility( View.VISIBLE ); + } else { - departures = (List) savedInstanceState.getSerializable("departures"); - adapter.setDepartures(departures); - selectedItemId = savedInstanceState.getInt("selectedItemId"); + provider = ProviderFactory.getDepartureProvider(); + + if (savedInstanceState == null) { + startDepartureFetcher(); + } else { + departures = (List) savedInstanceState.getSerializable("departures"); + adapter.setDepartures(departures); + selectedItemId = savedInstanceState.getInt("selectedItemId"); + } } }