Sparkle now finds the newest update in an appcast for which the host …

…meets the minimum system requirements. This fixes bug 228485. Thanks to Stuart Morgan for the patch.

SUAppcast.h

@@ -20,7 +20,6 @@
 - (void)setDelegate:delegate;
 - (void)setUserAgentString:(NSString *)userAgentString;
 
-- (SUAppcastItem *)newestItem;
 - (NSArray *)items;
 
 @end

SUAppcast.m

@@ -22,14 +22,6 @@ - (void)dealloc
 	[super dealloc];
 }
 
-- (SUAppcastItem *)newestItem
-{
-	if ([items count] > 0)
-		return [items objectAtIndex:0]; // the RSS class takes care of sorting by published date, descending.
-	else
-		return nil;
-}
-
 - (NSArray *)items
 {
 	return items;

SUBasicUpdateDriver.m

@@ -38,7 +38,10 @@ - (BOOL)hostSupportsItem:(SUAppcastItem *)ui
 
 - (BOOL)itemContainsSkippedVersion:(SUAppcastItem *)ui
 {
-	return [[[SUUserDefaults standardUserDefaults] objectForKey:SUSkippedVersionKey] isEqualToString:[ui versionString]];
+	NSString *skippedVersion = [[SUUserDefaults standardUserDefaults] objectForKey:SUSkippedVersionKey];
+	if (skippedVersion == nil) { return NO; }
+	return [[SUStandardVersionComparator defaultComparator] compareVersion:[ui versionString]
+																 toVersion:skippedVersion] != NSOrderedDescending;
 }
 
 - (BOOL)itemContainsValidUpdate:(SUAppcastItem *)ui
@@ -48,11 +51,19 @@ - (BOOL)itemContainsValidUpdate:(SUAppcastItem *)ui
 
 - (void)appcastDidFinishLoading:(SUAppcast *)ac
 {
-	updateItem = [[ac newestItem] retain];
+	NSArray* updates = [ac items];
+	if ([updates count] > 0)
+		[[SUUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:SULastCheckTimeKey];
+
+	// Find the first update we can actually use.
+	NSEnumerator *updateEnumerator = [updates objectEnumerator];
+	do {
+		updateItem = [updateEnumerator nextObject];
+	} while (updateItem && ![self hostSupportsItem:updateItem]);
+
+	[updateItem retain];
 	CFRelease(ac); // Remember that we're explicitly managing the memory of the appcast.
 	if (updateItem == nil) { [self didNotFindUpdate]; return; }
-
-	[[SUUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:SULastCheckTimeKey];
 
 	if ([self itemContainsValidUpdate:updateItem])
 		[self didFindValidUpdate];