From 73784c6a8488fef1ca7e6971a12868735d606de7 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 30 Mar 2016 19:27:59 +0200 Subject: UPDATES: Made interval set/get functions accept normal integers --- backends/updates/macosx/macosx-updates.h | 4 ++-- backends/updates/macosx/macosx-updates.mm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'backends/updates') diff --git a/backends/updates/macosx/macosx-updates.h b/backends/updates/macosx/macosx-updates.h index fd2d1f46f5..9f541ad02a 100644 --- a/backends/updates/macosx/macosx-updates.h +++ b/backends/updates/macosx/macosx-updates.h @@ -39,8 +39,8 @@ public: virtual void setAutomaticallyChecksForUpdates(UpdateState state); virtual UpdateState getAutomaticallyChecksForUpdates(); - virtual void setUpdateCheckInterval(UpdateInterval interval); - virtual UpdateInterval getUpdateCheckInterval(); + virtual void setUpdateCheckInterval(int interval); + virtual int getUpdateCheckInterval(); }; #endif diff --git a/backends/updates/macosx/macosx-updates.mm b/backends/updates/macosx/macosx-updates.mm index a94f1c21fd..c13f05f1c6 100644 --- a/backends/updates/macosx/macosx-updates.mm +++ b/backends/updates/macosx/macosx-updates.mm @@ -103,14 +103,14 @@ Common::UpdateManager::UpdateState MacOSXUpdateManager::getAutomaticallyChecksFo return kUpdateStateDisabled; } -void MacOSXUpdateManager::setUpdateCheckInterval(UpdateInterval interval) { +void MacOSXUpdateManager::setUpdateCheckInterval(int interval) { if (interval == kUpdateIntervalNotSupported) return; [sparkleUpdater setUpdateCheckInterval:(NSTimeInterval)interval]; } -Common::UpdateManager::UpdateInterval MacOSXUpdateManager::getUpdateCheckInterval() { +int MacOSXUpdateManager::getUpdateCheckInterval() { // This is kind of a hack but necessary, as the value stored by Sparkle // might have been changed outside of ScummVM (in which case we return the // default interval of one day) -- cgit v1.2.3 From 82963f7446f336fe71e71f35fa39768aed059541 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 31 Mar 2016 09:38:28 +0200 Subject: UPDATES: Read values from config file in MacOS X update manager --- backends/updates/macosx/macosx-updates.mm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'backends/updates') diff --git a/backends/updates/macosx/macosx-updates.mm b/backends/updates/macosx/macosx-updates.mm index c13f05f1c6..6f99e71ccf 100644 --- a/backends/updates/macosx/macosx-updates.mm +++ b/backends/updates/macosx/macosx-updates.mm @@ -27,6 +27,7 @@ #ifdef USE_SPARKLE #include "common/translation.h" +#include "common/config-manager.h" #include #include @@ -74,11 +75,13 @@ MacOSXUpdateManager::MacOSXUpdateManager() { // Finally give up our references to the objects [menuItem release]; - // Enable automatic update checking once a day (alternatively use - // checkForUpdates() here to check for updates on every startup) - // TODO: Should be removed when an update settings gui is implemented - setAutomaticallyChecksForUpdates(kUpdateStateEnabled); - setUpdateCheckInterval(kUpdateIntervalOneDay); + if (!ConfMan.hasKey("updates_check") + || ConfMan.getInt("updates_check") == Common::UpdateManager::kUpdateIntervalNotSupported) { + setAutomaticallyChecksForUpdates(kUpdateStateDisabled); + } else { + setAutomaticallyChecksForUpdates(kUpdateStateEnabled); + setUpdateCheckInterval(ConfMan.getInt("updates_check")); + } } MacOSXUpdateManager::~MacOSXUpdateManager() { -- cgit v1.2.3 From 33dc840d2f580ac9bd9d4634279294621692bafd Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 31 Mar 2016 15:34:50 +0200 Subject: UPDATES: Normalize update intervals at setting --- backends/updates/macosx/macosx-updates.mm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'backends/updates') diff --git a/backends/updates/macosx/macosx-updates.mm b/backends/updates/macosx/macosx-updates.mm index 6f99e71ccf..6c7ed03b52 100644 --- a/backends/updates/macosx/macosx-updates.mm +++ b/backends/updates/macosx/macosx-updates.mm @@ -110,6 +110,17 @@ void MacOSXUpdateManager::setUpdateCheckInterval(int interval) { if (interval == kUpdateIntervalNotSupported) return; + const int *vals = getUpdateIntervals(); + + while (*vals != -1) { + if (interval == *vals) + break; + vals++; + } + + if (*vals == -1) + interval = kUpdateIntervalOneDay; + [sparkleUpdater setUpdateCheckInterval:(NSTimeInterval)interval]; } -- cgit v1.2.3 From a743ec2e07ccada0286085ecec54f4d87ed49d44 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 1 Apr 2016 21:29:29 +0200 Subject: UPDATES: Implement and use method for normalizing interval value to accepted values --- backends/updates/macosx/macosx-updates.mm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'backends/updates') diff --git a/backends/updates/macosx/macosx-updates.mm b/backends/updates/macosx/macosx-updates.mm index 6c7ed03b52..fc967f8fec 100644 --- a/backends/updates/macosx/macosx-updates.mm +++ b/backends/updates/macosx/macosx-updates.mm @@ -80,7 +80,7 @@ MacOSXUpdateManager::MacOSXUpdateManager() { setAutomaticallyChecksForUpdates(kUpdateStateDisabled); } else { setAutomaticallyChecksForUpdates(kUpdateStateEnabled); - setUpdateCheckInterval(ConfMan.getInt("updates_check")); + setUpdateCheckInterval(normalizeInterval(ConfMan.getInt("updates_check"))); } } @@ -110,16 +110,7 @@ void MacOSXUpdateManager::setUpdateCheckInterval(int interval) { if (interval == kUpdateIntervalNotSupported) return; - const int *vals = getUpdateIntervals(); - - while (*vals != -1) { - if (interval == *vals) - break; - vals++; - } - - if (*vals == -1) - interval = kUpdateIntervalOneDay; + interval = normalizeInterval(interval); [sparkleUpdater setUpdateCheckInterval:(NSTimeInterval)interval]; } -- cgit v1.2.3