1 files changed, 21 insertions, 9 deletions

diff --git a/src/net/cbaines/suma/StopView.java b/src/net/cbaines/suma/StopView.java
index 08e5843..32cd3e1 100644
--- a/src/net/cbaines/suma/StopView.java
+++ b/src/net/cbaines/suma/StopView.java
@@ -126,29 +126,41 @@ public class StopView extends LinearLayout implements OnClickListener, OnLongCli
 
 	try {
 	    Dao<Bus, Integer> busDao = helper.getBusDao();
+	    Dao<BusRoute, Integer> busRouteDao = helper.getBusRouteDao();
 
 	    busDao.refresh(stop.bus);
+	    busRouteDao.refresh(stop.bus.route);
 
-	    if (stop.bus.id != null) {
+	    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);
 	    } else {
-		if (context.activityToast == null) {
-		    context.activityToast = Toast.makeText(context,
-			    "Arival prediction not avalible for timetabled buses", Toast.LENGTH_SHORT);
+		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 {
+			context.activityToast.setText("Bus schedules only avalible for Uni-Link buses");
+			context.activityToast.setDuration(Toast.LENGTH_SHORT);
+		    }
+		    context.activityToast.show();
 		} else {
-		    context.activityToast.setText("Arival prediction not avalible for timetabled buses");
-		    context.activityToast.setDuration(Toast.LENGTH_SHORT);
+		    if (context.activityToast == null) {
+			context.activityToast = Toast.makeText(context,
+				"Bus schedules not avalible for unidentified buses", Toast.LENGTH_SHORT);
+		    } else {
+			context.activityToast.setText("Bus schedules not avalible for unidentified buses");
+			context.activityToast.setDuration(Toast.LENGTH_SHORT);
+		    }
+		    context.activityToast.show();
 		}
-		context.activityToast.show();
 	    }
 
 	} catch (SQLException e) {
 	    e.printStackTrace();
 	}
-	return false;
+	return true;
     }
-
 }