@@ -289,20 +289,20 @@ open class UserDefaults: NSObject {
289
289
}
290
290
291
291
open func dictionaryRepresentation( ) -> [ String : Any ] {
292
- return _dictionaryRepresentation ( searchingOutsideOfSuite : true )
292
+ return _dictionaryRepresentation ( includingVolatileDomains : true )
293
293
}
294
294
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 : [ : ]
297
297
298
298
guard let defaultsFromDiskCF = CFPreferencesCopyMultiple ( nil , suite? . _cfObject ?? kCFPreferencesCurrentApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost) else {
299
299
return registeredDefaultsIfAllowed
300
300
}
301
301
302
- let defaultsFromDiskWithNumbersBoxed = _SwiftValue. fetch ( defaultsFromDiskCF) as? [ String : AnyObject ] ?? [ : ]
302
+ let defaultsFromDiskWithNumbersBoxed = _SwiftValue. fetch ( defaultsFromDiskCF) as? [ String : Any ] ?? [ : ]
303
303
304
304
if registeredDefaultsIfAllowed. count == 0 {
305
- return UserDefaults . _unboxingNSNumbers ( defaultsFromDiskWithNumbersBoxed) as! [ String : AnyObject ]
305
+ return UserDefaults . _unboxingNSNumbers ( defaultsFromDiskWithNumbersBoxed) as! [ String : Any ]
306
306
} else {
307
307
var allDefaults = registeredDefaultsIfAllowed
308
308
@@ -354,12 +354,12 @@ open class UserDefaults: NSObject {
354
354
}
355
355
356
356
open func persistentDomain( forName domainName: String ) -> [ String : Any ] ? {
357
- return UserDefaults ( suiteName: domainName) ? . _dictionaryRepresentation ( searchingOutsideOfSuite : false )
357
+ return UserDefaults ( suiteName: domainName) ? . _dictionaryRepresentation ( includingVolatileDomains : false )
358
358
}
359
359
360
360
open func setPersistentDomain( _ domain: [ String : Any ] , forName domainName: String ) {
361
361
if let defaults = UserDefaults ( suiteName: domainName) {
362
- for key in defaults. _dictionaryRepresentation ( searchingOutsideOfSuite : false ) . keys {
362
+ for key in defaults. _dictionaryRepresentation ( includingVolatileDomains : false ) . keys {
363
363
defaults. removeObject ( forKey: key)
364
364
}
365
365
@@ -375,7 +375,7 @@ open class UserDefaults: NSObject {
375
375
376
376
open func removePersistentDomain( forName domainName: String ) {
377
377
if let defaults = UserDefaults ( suiteName: domainName) {
378
- for key in defaults. _dictionaryRepresentation ( searchingOutsideOfSuite : false ) . keys {
378
+ for key in defaults. _dictionaryRepresentation ( includingVolatileDomains : false ) . keys {
379
379
defaults. removeObject ( forKey: key)
380
380
}
381
381
0 commit comments