Add missing attributes to NSURLSession.Configuration

Author: danieleggert

Foundation/NSURLSession.swift

@@ -1489,7 +1489,8 @@ public class NSURLSessionConfiguration : NSObject, NSCopying {
         super.init()
     }
 
-    private init(requestCachePolicy: NSURLRequestCachePolicy,
+    private init(identifier: String?,
+                 requestCachePolicy: NSURLRequestCachePolicy,
                  timeoutIntervalForRequest: NSTimeInterval,
                  timeoutIntervalForResource: NSTimeInterval,
                  networkServiceType: NSURLRequestNetworkServiceType,
@@ -1503,8 +1504,11 @@ public class NSURLSessionConfiguration : NSObject, NSCopying {
                  HTTPMaximumConnectionsPerHost: Int,
                  HTTPCookieStorage: NSHTTPCookieStorage?,
                  URLCredentialStorage: NSURLCredentialStorage?,
-                 URLCache: NSURLCache?)
+                 URLCache: NSURLCache?,
+                 shouldUseExtendedBackgroundIdleMode: Bool,
+                 protocolClasses: [AnyClass]?)
     {
+        self.identifier = identifier
         self.requestCachePolicy = requestCachePolicy
         self.timeoutIntervalForRequest = timeoutIntervalForRequest
         self.timeoutIntervalForResource = timeoutIntervalForResource
@@ -1520,11 +1524,17 @@ public class NSURLSessionConfiguration : NSObject, NSCopying {
         self.HTTPCookieStorage = HTTPCookieStorage
         self.URLCredentialStorage = URLCredentialStorage
         self.URLCache = URLCache
-        self.shouldUseExtendedBackgroundIdleMode = false
+        self.shouldUseExtendedBackgroundIdleMode = shouldUseExtendedBackgroundIdleMode
+        self.protocolClasses = protocolClasses
     }
 
     public override func copy() -> AnyObject {
+        return copyWithZone(nil)
+    }
+    
+    public func copyWithZone(zone: NSZone) -> AnyObject {
         return NSURLSessionConfiguration(
+            identifier: identifier,
             requestCachePolicy: requestCachePolicy,
             timeoutIntervalForRequest: timeoutIntervalForRequest,
             timeoutIntervalForResource: timeoutIntervalForResource,
@@ -1539,11 +1549,9 @@ public class NSURLSessionConfiguration : NSObject, NSCopying {
             HTTPMaximumConnectionsPerHost: HTTPMaximumConnectionsPerHost,
             HTTPCookieStorage: HTTPCookieStorage,
             URLCredentialStorage: URLCredentialStorage,
-            URLCache: URLCache)
-    }
-    
-    public func copyWithZone(zone: NSZone) -> AnyObject {
-        NSUnimplemented()
+            URLCache: URLCache,
+            shouldUseExtendedBackgroundIdleMode: shouldUseExtendedBackgroundIdleMode,
+            protocolClasses: protocolClasses)
     }
 
     public class func defaultSessionConfiguration() -> NSURLSessionConfiguration {
@@ -1553,7 +1561,7 @@ public class NSURLSessionConfiguration : NSObject, NSCopying {
     public class func backgroundSessionConfigurationWithIdentifier(identifier: String) -> NSURLSessionConfiguration { NSUnimplemented() }
 
     /* identifier for the background session configuration */
-    public var identifier: String? { NSUnimplemented() }
+    public var identifier: String?
 
     /* default cache policy for requests */
     public var requestCachePolicy: NSURLRequestCachePolicy
@@ -1641,6 +1649,9 @@ public class NSURLSessionConfiguration : NSObject, NSCopying {
 
 internal extension NSURLSession {
     struct Configuration {
+        /// identifier for the background session configuration
+        let identifier: String?
+        
         /// default cache policy for requests
         let requestCachePolicy: NSURLRequestCachePolicy
 
@@ -1653,6 +1664,12 @@ internal extension NSURLSession {
         /// type of service for requests.
         let networkServiceType: NSURLRequestNetworkServiceType
 
+        /// allow request to route over cellular.
+        let allowsCellularAccess: Bool
+        
+        /// allows background tasks to be scheduled at the discretion of the system for optimal performance.
+        let discretionary: Bool
+
         /// The proxy dictionary, as described by <CFNetwork/CFHTTPStream.h>
         let connectionProxyDictionary: [NSObject : AnyObject]?
 
@@ -1671,20 +1688,42 @@ internal extension NSURLSession {
         let HTTPAdditionalHeaders: [String : String]?
         /// The maximum number of simultanous persistent connections per host
         let HTTPMaximumConnectionsPerHost: Int
+        
+        /// The cookie storage object to use, or nil to indicate that no cookies should be handled
+        let HTTPCookieStorage: NSHTTPCookieStorage?
+        
+        /// The credential storage object, or nil to indicate that no credential storage is to be used
+        let URLCredentialStorage: NSURLCredentialStorage?
+        
+        /// The URL resource cache, or nil to indicate that no caching is to be performed
+        let URLCache: NSURLCache?
+        
+        /// Enable extended background idle mode for any tcp sockets created.
+        let shouldUseExtendedBackgroundIdleMode: Bool
+        
+        let protocolClasses: [AnyClass]?
     }
 }
 private extension NSURLSession.Configuration {
     init(URLSessionConfiguration config: NSURLSessionConfiguration) {
+        identifier = config.identifier
         requestCachePolicy = config.requestCachePolicy
         timeoutIntervalForRequest = config.timeoutIntervalForRequest
         timeoutIntervalForResource = config.timeoutIntervalForResource
         networkServiceType = config.networkServiceType
+        allowsCellularAccess = config.allowsCellularAccess
+        discretionary = config.discretionary
         connectionProxyDictionary = config.connectionProxyDictionary
         HTTPShouldUsePipelining = config.HTTPShouldUsePipelining
         HTTPShouldSetCookies = config.HTTPShouldSetCookies
         HTTPCookieAcceptPolicy = config.HTTPCookieAcceptPolicy
         HTTPAdditionalHeaders = config.HTTPAdditionalHeaders.map { convertToStringString(dictionary: $0) }
         HTTPMaximumConnectionsPerHost = config.HTTPMaximumConnectionsPerHost
+        HTTPCookieStorage = config.HTTPCookieStorage
+        URLCredentialStorage = config.URLCredentialStorage
+        URLCache = config.URLCache
+        shouldUseExtendedBackgroundIdleMode = config.shouldUseExtendedBackgroundIdleMode
+        protocolClasses = config.protocolClasses
     }
 }