summaryrefslogtreecommitdiff
path: root/Sora/Data/Settings
diff options
context:
space:
mode:
Diffstat (limited to 'Sora/Data/Settings')
-rw-r--r--Sora/Data/Settings/SettingsManager.swift24
1 files changed, 12 insertions, 12 deletions
diff --git a/Sora/Data/Settings/SettingsManager.swift b/Sora/Data/Settings/SettingsManager.swift
index 39317b4..666999b 100644
--- a/Sora/Data/Settings/SettingsManager.swift
+++ b/Sora/Data/Settings/SettingsManager.swift
@@ -25,10 +25,10 @@ class SettingsManager: ObservableObject { // swiftlint:disable:this type_body_l
@AppStorage("preloadedCarouselImages")
var preloadedCarouselImages = 3
- @AppStorage("enableICloudSync")
- var enableICloudSync: Bool = false
+ @AppStorage("enableSync")
+ var enableSync: Bool = false
- private var iCloudSyncObservation: NSObjectProtocol?
+ private var syncObservation: NSObjectProtocol?
#if os(macOS)
@AppStorage("saveTagsToFile")
@@ -142,12 +142,12 @@ class SettingsManager: ObservableObject { // swiftlint:disable:this type_body_l
// MARK: - Initialisation
init() {
- iCloudSyncObservation = NotificationCenter.default.addObserver(
+ syncObservation = NotificationCenter.default.addObserver(
forName: NSUbiquitousKeyValueStore.didChangeExternallyNotification,
object: NSUbiquitousKeyValueStore.default,
queue: .main
) { [weak self] _ in
- self?.pullSyncedSettings()
+ self?.syncFromCloud()
}
}
@@ -166,7 +166,7 @@ class SettingsManager: ObservableObject { // swiftlint:disable:this type_body_l
sort: ([T]) -> [T],
identifier: (T) -> UUID
) -> [T] {
- if enableICloudSync {
+ if enableSync {
if let iCloudData = NSUbiquitousKeyValueStore.default.data(forKey: key) {
if let iCloudValues = Self.decode([T].self, from: iCloudData) {
let localValues = Self.decode([T].self, from: localData) ?? []
@@ -198,7 +198,7 @@ class SettingsManager: ObservableObject { // swiftlint:disable:this type_body_l
localData.wrappedValue = Self.encode(sortedValues) ?? Data()
- if enableICloudSync {
+ if enableSync {
var iCloudValues: [T] = []
if let iCloudData = NSUbiquitousKeyValueStore.default.data(forKey: key) {
@@ -240,8 +240,8 @@ class SettingsManager: ObservableObject { // swiftlint:disable:this type_body_l
#endif
}
- func pullSyncedSettings() {
- if self.enableICloudSync {
+ func syncFromCloud() {
+ if self.enableSync {
if let data = NSUbiquitousKeyValueStore.default.data(forKey: "bookmarks") {
self.bookmarksData = data
}
@@ -258,8 +258,8 @@ class SettingsManager: ObservableObject { // swiftlint:disable:this type_body_l
}
}
- func syncToICloud() {
- if enableICloudSync {
+ func syncToCloud() {
+ if enableSync {
// Merge bookmarks
var iCloudBookmarks: [SettingsBookmark] = []
@@ -402,7 +402,7 @@ class SettingsManager: ObservableObject { // swiftlint:disable:this type_body_l
// MARK: - Deinitialisation
deinit {
- if let observation = iCloudSyncObservation {
+ if let observation = syncObservation {
NotificationCenter.default.removeObserver(observation)
}
}