Merge branch 'dev'

Conflicts:
	src/net/cbaines/suma/BusActivity.java
	src/net/cbaines/suma/BusSpecificStopView.java
	src/net/cbaines/suma/BusStopActivity.java
	src/net/cbaines/suma/StopView.java

1 files changed, 20 insertions, 12 deletions

diff --git a/src/net/cbaines/suma/POIFavouriteComparator.java b/src/net/cbaines/suma/POIFavouriteComparator.java
index 94148d4..341ff4c 100644
--- a/src/net/cbaines/suma/POIFavouriteComparator.java
+++ b/src/net/cbaines/suma/POIFavouriteComparator.java
@@ -21,20 +21,28 @@ package net.cbaines.suma;
 
 import java.util.Comparator;
 
+import android.content.SharedPreferences;
+
 public class POIFavouriteComparator implements Comparator<POI> {
 
-    public int compare(POI poi1, POI poi2) {
-	if (poi1.favourite) {
-	    if (poi2.favourite) {
-		return 0;
-	    } else {
-		return 1;
-	    }
-	} else if (poi2.favourite) {
-	    return -1;
-	} else {
-	    return 0;
+	SharedPreferences favourites;
+
+	POIFavouriteComparator(SharedPreferences favourites) {
+		this.favourites = favourites;
+	}
+
+	public int compare(POI poi1, POI poi2) {
+		if (favourites.getBoolean(poi1.id, false)) {
+			if (favourites.getBoolean(poi2.id, false)) {
+				return 0;
+			} else {
+				return 1;
+			}
+		} else if (favourites.getBoolean(poi2.id, false)) {
+			return -1;
+		} else {
+			return 0;
+		}
 	}
-    }
 
 }