diff options
author | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
---|---|---|
committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
commit | cde3c08d7e9e486d7d1a795832ea1b767d96a4f3 (patch) | |
tree | f1af1424ebf5cb3a548a7d73257723395dccb267 /src/net/cbaines/suma/StopView.java | |
parent | 7e88b00e017bde16c12e6adb78883acf7b2ba575 (diff) | |
parent | 5f2b8712079aeb5b7cee476b06b36013edac4fb3 (diff) | |
download | southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar.gz |
Merge branch 'dev'
Conflicts:
src/net/cbaines/suma/BusSpecificStopView.java
src/net/cbaines/suma/StopView.java
Diffstat (limited to 'src/net/cbaines/suma/StopView.java')
-rw-r--r-- | src/net/cbaines/suma/StopView.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/net/cbaines/suma/StopView.java b/src/net/cbaines/suma/StopView.java index 27c3a4c..9a0dcd3 100644 --- a/src/net/cbaines/suma/StopView.java +++ b/src/net/cbaines/suma/StopView.java @@ -22,8 +22,8 @@ package net.cbaines.suma; import java.sql.SQLException; import java.text.DateFormat; -import android.app.Activity; import android.content.Intent; +import android.net.Uri; import android.util.Log; import android.view.Gravity; import android.view.View; @@ -87,7 +87,6 @@ public class StopView extends LinearLayout implements OnClickListener, OnLongCli if (stop.bus.id != null) { if (stop.live) { - onClickMessage = "Bus " + stop.bus.toString() + " at " + DateFormat.getTimeInstance(DateFormat.SHORT).format(stop.arivalTime); } else { @@ -113,7 +112,6 @@ public class StopView extends LinearLayout implements OnClickListener, OnLongCli public void onClick(View v) { if (context.activityToast == null) { - context.activityToast = Toast.makeText(context, onClickMessage, Toast.LENGTH_SHORT); } else { context.activityToast.setText(onClickMessage); @@ -124,7 +122,6 @@ public class StopView extends LinearLayout implements OnClickListener, OnLongCli } public boolean onLongClick(View v) { - DatabaseHelper helper = OpenHelperManager.getHelper(context, DatabaseHelper.class); try { @@ -137,14 +134,14 @@ public class StopView extends LinearLayout implements OnClickListener, OnLongCli Log.i("StopView", "Bus route " + stop.bus.route + " Uni-Link " + stop.bus.route.uniLink + " Bus ID " + stop.bus.id); if (stop.bus.id != null && stop.bus.route.uniLink) { - Intent i = new Intent(context, BusActivity.class); - i.putExtra("busID", stop.bus.id); - i.putExtra("busStopID", stop.busStop.id); - ((Activity) context).startActivityForResult(i, 0); + Uri uri = Uri.parse("http://id.southampton.ac.uk/bus/" + stop.bus.id); + + Intent busStopIntent = new Intent(Intent.ACTION_VIEW, uri); + busStopIntent.putExtra("busStopID", stop.busStop.id); + context.startActivity(busStopIntent); } else { if (!stop.bus.route.uniLink) { if (context.activityToast == null) { - context.activityToast = Toast.makeText(context, "Bus schedules only avalible for Uni-Link buses", Toast.LENGTH_SHORT); } else { @@ -154,7 +151,6 @@ public class StopView extends LinearLayout implements OnClickListener, OnLongCli context.activityToast.show(); } else { if (context.activityToast == null) { - context.activityToast = Toast.makeText(context, "Bus schedules not avalible for unidentified buses", Toast.LENGTH_SHORT); } else { |