mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-23 21:05:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Respect skipAutoUpdateCheck in nextcloud.cfg with Sparkle on macOS

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
This commit is contained in:
Claudio Cambra 2022-07-11 12:09:12 +02:00
parent bceae89ca1
commit f2dbceaee0
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gui/updater/sparkleupdater_mac.mm
View file

@ -19,6 +19,7 @@
#include <AppKit/NSApplication.h>
#include "common/utility.h"
#include "configfile.h"
#include "updater/sparkleupdater.h"
@interface DelegateObject : NSObject <SUUpdaterDelegate>
@ -119,17 +120,23 @@ void SparkleUpdater::setUpdateUrl(const QUrl &url)
[d->updater setFeedURL: nsurl];
}
// FIXME: Should be changed to not instanicate the SparkleUpdater at all in this case
// FIXME: Should be changed to not instantiate the SparkleUpdater at all in this case
bool autoUpdaterAllowed()
{
// See https://github.com/owncloud/client/issues/2931
NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
NSString *expectedPath = [NSString stringWithFormat:@"/Applications/%@", [bundlePath lastPathComponent]];
if ([expectedPath isEqualTo:bundlePath]) {
return true;
if (![expectedPath isEqualTo:bundlePath]) {
qCWarning(lcUpdater) << "We are not in /Applications, won't check for update!";
return false;
}
qCWarning(lcUpdater) << "We are not in /Applications, won't check for update!";
return false;
if(ConfigFile().skipUpdateCheck()) {
qCWarning(lcUpdater) << "Auto-updating has been set to skip in nextcloud.cfg, won't check for update.";
return false;
}
return true;
}