From 884fdc04a91754c04e9404f8c3e92bcd98cba8fc Mon Sep 17 00:00:00 2001
From: Abhishek Banthia <8280282+n0shake@users.noreply.github.com>
Date: Sat, 19 Mar 2022 20:29:31 -0400
Subject: [PATCH] Cleanup redundant method.

---
 Clocker/Overall App/DataStore.swift              |  8 ++++----
 .../Preferences/Menu Bar/StatusItemHandler.swift | 16 ++--------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/Clocker/Overall App/DataStore.swift b/Clocker/Overall App/DataStore.swift
index 4cb91ee..4a180ea 100644
--- a/Clocker/Overall App/DataStore.swift	
+++ b/Clocker/Overall App/DataStore.swift	
@@ -23,7 +23,7 @@ enum ViewType {
 class DataStore: NSObject {
     private static var sharedStore = DataStore(with: UserDefaults.standard)
     private var userDefaults: UserDefaults!
-    private var defaultUbiquotousKeyValueStore: NSUbiquitousKeyValueStore!
+    private var ubiquitousStore: NSUbiquitousKeyValueStore!
 
     // Since these pref can accessed every second, let's cache this
     private var shouldDisplayDayInMenubar: Bool = false
@@ -41,13 +41,13 @@ class DataStore: NSObject {
     init(with defaults: UserDefaults) {
         super.init()
         userDefaults = defaults
-        defaultUbiquotousKeyValueStore = NSUbiquitousKeyValueStore.default
+        ubiquitousStore = NSUbiquitousKeyValueStore.default
         shouldDisplayDayInMenubar = shouldDisplay(.dayInMenubar)
         shouldDisplayDateInMenubar = shouldDisplay(.dateInMenubar)
     }
 
     func timezones() -> [Data] {
-        if let cloudPreferences = defaultUbiquotousKeyValueStore.object(forKey: CLDefaultPreferenceKey) as? [Data] {
+        if let cloudPreferences = ubiquitousStore.object(forKey: CLDefaultPreferenceKey) as? [Data] {
             Logger.info("Returning preferences from NSUbiquitousKeyValueStore")
             return cloudPreferences
         }
@@ -62,7 +62,7 @@ class DataStore: NSObject {
     func setTimezones(_ timezones: [Data]?) {
         userDefaults.set(timezones, forKey: CLDefaultPreferenceKey)
         // iCloud sync
-        defaultUbiquotousKeyValueStore.set(timezones, forKey: CLDefaultPreferenceKey)
+        ubiquitousStore.set(timezones, forKey: CLDefaultPreferenceKey)
     }
 
     func menubarTimezones() -> [Data]? {
diff --git a/Clocker/Preferences/Menu Bar/StatusItemHandler.swift b/Clocker/Preferences/Menu Bar/StatusItemHandler.swift
index 4c52168..b26ba91 100644
--- a/Clocker/Preferences/Menu Bar/StatusItemHandler.swift	
+++ b/Clocker/Preferences/Menu Bar/StatusItemHandler.swift	
@@ -137,7 +137,7 @@ class StatusItemHandler: NSObject {
     private func constructCompactView() {
         parentView = nil
 
-        let menubarTimezones = retrieveSyncedMenubarTimezones()
+        let menubarTimezones = DataStore.shared().menubarTimezones() ?? []
 
         if menubarTimezones.isEmpty {
             currentState = .icon
@@ -149,18 +149,6 @@ class StatusItemHandler: NSObject {
         statusItem.view?.window?.backgroundColor = NSColor.clear
     }
 
-    private func retrieveSyncedMenubarTimezones() -> [Data] {
-        let defaultPreferences = DataStore.shared().timezones()
-
-        let menubarTimezones = defaultPreferences.filter { data -> Bool in
-            if let timezoneObj = TimezoneData.customObject(from: data) {
-                return timezoneObj.isFavourite == 1
-            }
-            return false
-        }
-        return menubarTimezones
-    }
-
     // This is called when the Apple interface style pre-Mojave is changed.
     // In High Sierra and before, we could have a dark or light menubar and dock
     // Our icon is template, so it changes automatically; so is our standard status bar text
@@ -210,7 +198,7 @@ class StatusItemHandler: NSObject {
     }
 
     private func shouldDisplaySecondsInMenubar() -> Bool {
-        let syncedTimezones = retrieveSyncedMenubarTimezones()
+        let syncedTimezones = DataStore.shared().menubarTimezones() ?? []
 
         for timezone in syncedTimezones {
             if let timezoneObj = TimezoneData.customObject(from: timezone) {