Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-07-20 14:22:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip local-only settings keys when enabling iCloud settings sync

Browse Source 
refreshFromiCloud already skipped isLocalOnly keys, but the enable-time
paths did not: replaceWithiCloudData overwrote device-specific settings
with another device's values, and syncToiCloud uploaded local-only keys
to the ubiquitous store. Apply the same skip in both.
This commit is contained in:
Arkadiusz Fal
2026-07-15 06:33:02 +02:00
parent 10ca000387
commit 262dab8f9e
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Yattee/Core/Settings/SettingsManager+CloudSync.swift
View File

@@ -335,6 +335,11 @@ extension SettingsManager {
// Copy all local settings to iCloud // Copy all local settings to iCloud
for key in SettingsKey.allCases { for key in SettingsKey.allCases {
// Skip local-only keys (device-specific settings that shouldn't sync)
if key.isLocalOnly {
continue
}
let pKey = platformKey(key) let pKey = platformKey(key)
if let value = localDefaults.object(forKey: pKey) { if let value = localDefaults.object(forKey: pKey) {
ubiquitousStore.set(value, forKey: pKey) ubiquitousStore.set(value, forKey: pKey)
@@ -362,6 +367,11 @@ extension SettingsManager {
// Copy all iCloud settings to local defaults // Copy all iCloud settings to local defaults
for key in SettingsKey.allCases { for key in SettingsKey.allCases {
// Skip local-only keys (device-specific settings that shouldn't sync)
if key.isLocalOnly {
continue
}
// Skip protected keys that should preserve local values // Skip protected keys that should preserve local values
if keysToPreserve.contains(key) { if keysToPreserve.contains(key) {
continue continue