optionals cleanup

This commit is contained in:
Suresh, Kamlesh 2021-01-19 16:46:39 -05:00
parent 0091c419d1
commit d52b05d0ac

View File

@ -13,12 +13,12 @@ public extension MVMCoreActionHandler {
/// Iterates threw the clientParameters list. Gets values from the individual handlers and attaches the parameters to extraParameters. /// Iterates threw the clientParameters list. Gets values from the individual handlers and attaches the parameters to extraParameters.
@objc func setClientParameter(with actionMap: [String: Any]?, completionHandler: @escaping ([String : Any]?) -> ()) { @objc func setClientParameter(with actionMap: [String: Any]?, completionHandler: @escaping ([String : Any]?) -> ()) {
guard let clientParameters = actionMap?.optionalDictionaryForKey("clientParameters") else { guard let actionMap = actionMap, let clientParameters = actionMap.optionalDictionaryForKey("clientParameters") else {
completionHandler(actionMap) completionHandler(nil)
return return
} }
let isBackgroudRequest = actionMap?.boolForKey("background") ?? false let isBackgroudRequest = actionMap.boolForKey("background")
if !isBackgroudRequest { if !isBackgroudRequest {
MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.startLoading() MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.startLoading()
@ -38,10 +38,10 @@ public extension MVMCoreActionHandler {
return return
} }
var extraParams: [String : Any] = actionMap?.dictionaryForKey(KeyExtraParameters) var extraParams: [String : Any] = actionMap.dictionaryForKey(KeyExtraParameters)
extraParams.merge(clientParams) { (_, new) in new } extraParams.merge(clientParams) { (_, new) in new }
var actionMapM = actionMap var actionMapM = actionMap
actionMapM?[KeyExtraParameters] = extraParams actionMapM[KeyExtraParameters] = extraParams
stopLoadingOverlay() stopLoadingOverlay()
completionHandler(actionMapM) completionHandler(actionMapM)