From fb13eb72032c0f9b7c0e0e2d4e86375fffcb6416 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik@verbruggen.consulting>
Date: Thu, 7 Oct 2021 15:56:07 +0200
Subject: [PATCH] macOS: Simplify Utility::hasDarkSystray()

Signed-off-by: Camila Ayres <hello@camilasan.com>
---
 src/common/utility_mac.mm | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/common/utility_mac.mm b/src/common/utility_mac.mm
index 656a36fd14..c87c22d771 100644
--- a/src/common/utility_mac.mm
+++ b/src/common/utility_mac.mm
@@ -27,6 +27,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreServices/CoreServices.h>
 #import <Foundation/NSFileManager.h>
+#import <Foundation/NSUserDefaults.h>
 
 namespace OCC {
 
@@ -223,17 +224,13 @@ void Utility::setLaunchOnStartup(const QString &appName, const QString &guiName,
 #ifndef TOKEN_AUTH_ONLY
 bool Utility::hasDarkSystray()
 {
-    bool returnValue = false;
-    CFStringRef interfaceStyleKey = CFSTR("AppleInterfaceStyle");
-    CFStringRef interfaceStyle = nullptr;
-    CFStringRef darkInterfaceStyle = CFSTR("Dark");
-    interfaceStyle = (CFStringRef)CFPreferencesCopyAppValue(interfaceStyleKey,
-        kCFPreferencesCurrentApplication);
-    if (interfaceStyle) {
-        returnValue = (kCFCompareEqualTo == CFStringCompare(interfaceStyle, darkInterfaceStyle, 0));
-        CFRelease(interfaceStyle);
+    @autoreleasepool {
+        if (auto style = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"]) {
+            return [style isEqualToString:@"Dark"];
+        }
     }
-    return returnValue;
+
+    return false;
 }
 #endif