/[projects]/android/TrainInfo/src/dk/thoerup/traininfo/ShortcutActivity.java
ViewVC logotype

Diff of /android/TrainInfo/src/dk/thoerup/traininfo/ShortcutActivity.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1561 by torben, Mon May 2 11:54:17 2011 UTC revision 1562 by torben, Fri Jul 8 16:26:09 2011 UTC
# Line 11  import android.widget.TextView; Line 11  import android.widget.TextView;
11  import android.widget.Toast;  import android.widget.Toast;
12  import dk.thoerup.android.traininfo.common.StationEntry;  import dk.thoerup.android.traininfo.common.StationEntry;
13  import dk.thoerup.traininfo.WelcomeScreen.ListType;  import dk.thoerup.traininfo.WelcomeScreen.ListType;
14    import dk.thoerup.traininfo.util.StationEntryCsv;
15    
16  public class ShortcutActivity extends Activity {  public class ShortcutActivity extends Activity {
17            
# Line 67  public class ShortcutActivity extends Ac Line 68  public class ShortcutActivity extends Ac
68                  String stationStr = intent.getStringExtra("station");                  String stationStr = intent.getStringExtra("station");
69                                    
70                  if (stationStr != null) { //haven't reproduced it, but got a stacktrace where stationStr apparently was null                  if (stationStr != null) { //haven't reproduced it, but got a stacktrace where stationStr apparently was null
71                          StationEntry station = StationEntry.fromCSV(stationStr);                          StationEntry station = StationEntryCsv.fromCSV(stationStr);
72    
73                          Intent launcher = new Intent( this, DepartureList.class );                          Intent launcher = new Intent( this, DepartureList.class );
74                          launcher.putExtra("stationbean", station);                          launcher.putExtra("stationbean", station);
# Line 109  public class ShortcutActivity extends Ac Line 110  public class ShortcutActivity extends Ac
110          // First, set up the shortcut intent.            // First, set up the shortcut intent.  
111          Intent shortcutIntent = new Intent(Intent.ACTION_MAIN);          Intent shortcutIntent = new Intent(Intent.ACTION_MAIN);
112          shortcutIntent.setClassName(this, this.getClass().getName());          shortcutIntent.setClassName(this, this.getClass().getName());
113          shortcutIntent.putExtra("station", station.toCSV() );          shortcutIntent.putExtra("station", StationEntryCsv.toCSV(station) );
114    
115                    
116          // Then, set up the container intent (the response to the caller)          // Then, set up the container intent (the response to the caller)
Legend:
Removed from v.1561  
changed lines
  Added in v.1562
  ViewVC Help
Powered by ViewVC 1.1.20