Skip to content

Commit 1bac2b3

Browse files
committed
These two casts were implicitly relying on bridging. They don’t work on Linux; fix them.
Fix naming per review.
1 parent c60c771 commit 1bac2b3

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Foundation/UserDefaults.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -289,20 +289,20 @@ open class UserDefaults: NSObject {
289289
}
290290

291291
open func dictionaryRepresentation() -> [String: Any] {
292-
return _dictionaryRepresentation(searchingOutsideOfSuite: true)
292+
return _dictionaryRepresentation(includingVolatileDomains: true)
293293
}
294294

295-
private func _dictionaryRepresentation(searchingOutsideOfSuite: Bool) -> [String: Any] {
296-
let registeredDefaultsIfAllowed = searchingOutsideOfSuite ? registeredDefaults : [:]
295+
private func _dictionaryRepresentation(includingVolatileDomains: Bool) -> [String: Any] {
296+
let registeredDefaultsIfAllowed = includingVolatileDomains ? registeredDefaults : [:]
297297

298298
guard let defaultsFromDiskCF = CFPreferencesCopyMultiple(nil, suite?._cfObject ?? kCFPreferencesCurrentApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost) else {
299299
return registeredDefaultsIfAllowed
300300
}
301301

302-
let defaultsFromDiskWithNumbersBoxed = _SwiftValue.fetch(defaultsFromDiskCF) as? [String: AnyObject] ?? [:]
302+
let defaultsFromDiskWithNumbersBoxed = _SwiftValue.fetch(defaultsFromDiskCF) as? [String: Any] ?? [:]
303303

304304
if registeredDefaultsIfAllowed.count == 0 {
305-
return UserDefaults._unboxingNSNumbers(defaultsFromDiskWithNumbersBoxed) as! [String: AnyObject]
305+
return UserDefaults._unboxingNSNumbers(defaultsFromDiskWithNumbersBoxed) as! [String: Any]
306306
} else {
307307
var allDefaults = registeredDefaultsIfAllowed
308308

@@ -354,12 +354,12 @@ open class UserDefaults: NSObject {
354354
}
355355

356356
open func persistentDomain(forName domainName: String) -> [String : Any]? {
357-
return UserDefaults(suiteName: domainName)?._dictionaryRepresentation(searchingOutsideOfSuite: false)
357+
return UserDefaults(suiteName: domainName)?._dictionaryRepresentation(includingVolatileDomains: false)
358358
}
359359

360360
open func setPersistentDomain(_ domain: [String : Any], forName domainName: String) {
361361
if let defaults = UserDefaults(suiteName: domainName) {
362-
for key in defaults._dictionaryRepresentation(searchingOutsideOfSuite: false).keys {
362+
for key in defaults._dictionaryRepresentation(includingVolatileDomains: false).keys {
363363
defaults.removeObject(forKey: key)
364364
}
365365

@@ -375,7 +375,7 @@ open class UserDefaults: NSObject {
375375

376376
open func removePersistentDomain(forName domainName: String) {
377377
if let defaults = UserDefaults(suiteName: domainName) {
378-
for key in defaults._dictionaryRepresentation(searchingOutsideOfSuite: false).keys {
378+
for key in defaults._dictionaryRepresentation(includingVolatileDomains: false).keys {
379379
defaults.removeObject(forKey: key)
380380
}
381381

0 commit comments

Comments
 (0)