Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 569522: Try to ensure that update checks never run with out-of-date URLs. Patch by smorgan, sr=pink, a/Cm2.0.4=me

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@260548 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alqahira%ardisson.org 2010-06-24 03:44:15 +00:00
parent 904a45d99e
commit 38aafc9504
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/camino/src/preferences/PreferenceManager.mm
View File

@ -672,20 +672,31 @@ static BOOL gMadePrefManager;
// This block can be removed in some later release, after we can assume that // This block can be removed in some later release, after we can assume that
// everyone has run something later than 1.6.x // everyone has run something later than 1.6.x
NSString* const kSparkleCheckIntervalKey = @"SUScheduledCheckInterval"; NSString* const kSparkleCheckIntervalKey = @"SUScheduledCheckInterval";
NSString* const kSparkleUpdateChecksEnabled = @"SUEnableAutomaticChecks";
NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
if ([defaults objectForKey:kSparkleCheckIntervalKey]) { if ([defaults objectForKey:kSparkleCheckIntervalKey]) {
BOOL wasEnabled = [defaults integerForKey:kSparkleCheckIntervalKey] > 0; BOOL wasEnabled = [defaults integerForKey:kSparkleCheckIntervalKey] > 0;
[defaults removeObjectForKey:kSparkleCheckIntervalKey]; [defaults removeObjectForKey:kSparkleCheckIntervalKey];
if (wasEnabled) if (wasEnabled)
[defaults removeObjectForKey:@"SUEnableAutomaticChecks"]; [defaults removeObjectForKey:kSparkleUpdateChecksEnabled];
else else
[[SUUpdater sharedUpdater] setAutomaticallyChecksForUpdates:NO]; [[SUUpdater sharedUpdater] setAutomaticallyChecksForUpdates:NO];
} }
// If updates are disabled for this build, don't bother setting up the manifest URL.
NSBundle* mainBundle = [NSBundle mainBundle]; NSBundle* mainBundle = [NSBundle mainBundle];
if (![[mainBundle objectForInfoDictionaryKey:@"SUEnableAutomaticChecks"] boolValue]) if (![[mainBundle objectForInfoDictionaryKey:kSparkleUpdateChecksEnabled] boolValue]) {
// If SUEnableAutomaticChecks is set to YES in the user's prefs, that will
// override our plist setting, and Sparkle will check for updates anyway,
// which shouldn't happen. In the 2.0+ setup, SUEnableAutomaticChecks should
// never be set to YES at the defaults level (the options are NO at the
// defaults level, or YES at the plist level and nothing at the user level),
// so just unconditionally clear it if that somehow happens.
if ([[defaults objectForKey:kSparkleUpdateChecksEnabled] boolValue])
[defaults removeObjectForKey:kSparkleUpdateChecksEnabled];
// If updates are disabled for this build, don't bother setting up the
// manifest URL.
return; return;
}
// Get the base auto-update manifest URL. // Get the base auto-update manifest URL.
NSString* baseURL = [self getStringPref:kGeckoPrefUpdateURLOverride NSString* baseURL = [self getStringPref:kGeckoPrefUpdateURLOverride