Merge pull request #3038 from Landschaft/master

[Swift] #3036 Make APIHelper.convertBoolToString return nil for nil input
This commit is contained in:
wing328 2016-06-08 00:26:55 +08:00
commit 6a73f29cef

View File

@ -19,12 +19,14 @@ class APIHelper {
return destination return destination
} }
static func convertBoolToString(source: [String: AnyObject]?) -> [String:AnyObject] { static func convertBoolToString(source: [String: AnyObject]?) -> [String:AnyObject]? {
guard let source = source else {
return nil
}
var destination = [String:AnyObject]() var destination = [String:AnyObject]()
let theTrue = NSNumber(bool: true) let theTrue = NSNumber(bool: true)
let theFalse = NSNumber(bool: false) let theFalse = NSNumber(bool: false)
if (source != nil) { for (key, value) in source {
for (key, value) in source! {
switch value { switch value {
case let x where x === theTrue || x === theFalse: case let x where x === theTrue || x === theFalse:
destination[key] = "\(value as! Bool)" destination[key] = "\(value as! Bool)"
@ -32,7 +34,6 @@ class APIHelper {
destination[key] = value destination[key] = value
} }
} }
}
return destination return destination
} }