From 98f5f45322aebfc7c957fc936d2a2d89e0c8901f Mon Sep 17 00:00:00 2001
From: "Suresh, Kamlesh" <kamlesh.suresh@verizonwireless.com>
Date: Wed, 3 Mar 2021 16:29:17 -0500
Subject: [PATCH] codereview

---
 .../ActionHandling/MVMCoreActionHandler.m     | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
index 35fb29e..437faae 100644
--- a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
+++ b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
@@ -93,22 +93,19 @@ NSString * const KeyActionTypeOpen = @"openPage";
     }
 }
 
-- (void)setClientParameter:(nullable NSDictionary *)clientParametersMap requestParameters:(nullable NSDictionary *)requestParameters isBackgroudRequest:(BOOL)isBackgroudRequest completionHandler:(nonnull void (^)(NSDictionary * _Nullable extraParameters))completionHandler {
+- (void)setClientParameter:(nullable NSDictionary *)clientParametersMap requestParameters:(nullable NSDictionary *)requestParameters showLoadingOverlay:(BOOL)showLoadingOverlay completionHandler:(nonnull void (^)(NSDictionary * _Nullable extraParameters))completionHandler {
     
-    //NSDictionary *clientParametersMap = [actionInformation dict:KeyClientParameters];
     if (!clientParametersMap) {
         completionHandler(nil);
         return;
     }
-    
-   // BOOL isBackgroudRequest = [actionInformation boolForKey:@"background"];
-    
-    if (!isBackgroudRequest) {
+
+    if (showLoadingOverlay) {
         [[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] startLoading];
     }
     
     void (^stopLoadingOverlay)(void) = ^(void) {
-        if (!isBackgroudRequest) {
+        if (showLoadingOverlay) {
             [[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] stopLoading:true];
         }
     };
@@ -164,22 +161,17 @@ NSString * const KeyActionTypeOpen = @"openPage";
         return;
     }
 
-    __weak typeof(self) weakSelf = self;
-    void (^performAction)(NSDictionary*) = ^(NSDictionary* actionMap) {
-        MVMCoreRequestParameters *requestParameters = [[MVMCoreRequestParameters alloc] initWithActionMap:actionMap];
+    MVMCoreRequestParameters *requestParameters = [[MVMCoreRequestParameters alloc] initWithActionMap:actionInformation];
 
-        requestParameters.clientParamters = [actionInformation dict:KeyClientParameters];
+    requestParameters.clientParamters = [actionInformation dict:KeyClientParameters];
 
-        [weakSelf updateRequestParametersBeforeHandleOpenPageAction:requestParameters callBack:^(MVMCoreRequestParameters * _Nonnull requestParameters) {
-            if ([delegateObject.actionDelegate respondsToSelector:@selector(handleOpenPageForRequestParameters:actionInformation:additionalData:)]) {
-                [delegateObject.actionDelegate handleOpenPageForRequestParameters:requestParameters actionInformation:actionInformation additionalData:additionalData];
-            } else {
-                [MVMCoreActionHandler defaultHandleOpenPageForRequestParameters:requestParameters additionalData:additionalData delegateObject:delegateObject];
-            }
-        }];
-    };
-
-    performAction(actionInformation);
+    [self updateRequestParametersBeforeHandleOpenPageAction:requestParameters callBack:^(MVMCoreRequestParameters * _Nonnull requestParameters) {
+        if ([delegateObject.actionDelegate respondsToSelector:@selector(handleOpenPageForRequestParameters:actionInformation:additionalData:)]) {
+            [delegateObject.actionDelegate handleOpenPageForRequestParameters:requestParameters actionInformation:actionInformation additionalData:additionalData];
+        } else {
+            [MVMCoreActionHandler defaultHandleOpenPageForRequestParameters:requestParameters additionalData:additionalData delegateObject:delegateObject];
+        }
+    }];
 }
 
 - (void)shareAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject {
@@ -365,7 +357,7 @@ NSString * const KeyActionTypeOpen = @"openPage";
 
     [self setClientParameter:[actionInformation dict:KeyClientParameters]
            requestParameters:nil
-          isBackgroudRequest:false
+          showLoadingOverlay:true
            completionHandler:performAction];
 }
 
@@ -435,7 +427,7 @@ NSString * const KeyActionTypeOpen = @"openPage";
     if (requestParameters.clientParamters) {
         [[MVMCoreActionHandler sharedActionHandler] setClientParameter:requestParameters.clientParamters
                requestParameters: requestParameters.parameters
-              isBackgroudRequest: NO
+             showLoadingOverlay: !requestParameters.backgroundRequest
             completionHandler: ^(NSDictionary * _Nullable jsonDictionary) {
             [requestParameters addRequestParameters:jsonDictionary];
             performRequest(requestParameters);