switch to new request class on feature flag (#201)

* switch to new request on feature flag

* actually return LPRequesting

* fix naming;

* refactor into own method

Author: e7mac

Leanplum-SDK/Classes/Internal/FeatureFlag/LPFeatureFlagManager.h

@@ -6,10 +6,11 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "LPFeatureFlags.h"
 
 @interface LPFeatureFlagManager : NSObject
 
-+ (instancetype)sharedManager;
++ (_Nonnull instancetype)sharedManager;
 
 -(void)refreshEnabledFeatureFlags:(nullable NSArray<NSString *> *)featureFlags;
 -(BOOL)isFeatureFlagEnabled:(nonnull NSString *)featureFlagName;

Leanplum-SDK/Classes/Internal/FeatureFlag/LPFeatureFlags.h

@@ -0,0 +1,13 @@
+//
+//  LPFeatureFlags.h
+//  Pods
+//
+//  Created by Mayank Sanganeria on 8/30/18.
+//
+
+#ifndef LPFeatureFlags_h
+#define LPFeatureFlags_h
+
+#define LP_FEATURE_FLAG_REQUEST_REFACTOR @"request_refactor"
+
+#endif /* LPFeatureFlags_h */

Leanplum-SDK/Classes/Managers/Networking/LPRequest.h

@@ -24,9 +24,10 @@
 
 #import <Foundation/Foundation.h>
 #import "Leanplum.h"
+#import "LPRequesting.h"
 #import "LPNetworkFactory.h"
 
-@interface LPRequest : NSObject
+@interface LPRequest : NSObject <LPRequesting>
 
 @property (nonatomic, strong) NSString *apiMethod;
 @property (nonatomic, strong) NSDictionary *params;

Leanplum-SDK/Classes/Managers/Networking/LPRequestFactory.m

@@ -23,6 +23,7 @@
 //  under the License.
 
 #import "LPRequestFactory.h"
+#import "LPRequest.h"
 #import "LeanplumRequest.h"
 
 @interface LPRequestFactory()
@@ -42,11 +43,21 @@ -(instancetype)initWithFeatureFlagManager:(LPFeatureFlagManager *)featureFlagMan
 }
 
 - (id<LPRequesting>)createGetForApiMethod:(NSString *)apiMethod params:(NSDictionary *)params {
+    if ([self shouldReturnLPRequestClass]) {
+        return [LPRequest get:apiMethod params:params];
+    }
     return [LeanplumRequest get:apiMethod params:params];
 }
 
 - (id<LPRequesting>)createPostForApiMethod:(NSString *)apiMethod params:(NSDictionary *)params {
+    if ([self shouldReturnLPRequestClass]) {
+        return [LPRequest get:apiMethod params:params];
+    }
     return [LeanplumRequest post:apiMethod params:params];
 }
 
+-(BOOL)shouldReturnLPRequestClass {
+    return [self.featureFlagManager isFeatureFlagEnabled:LP_FEATURE_FLAG_REQUEST_REFACTOR];
+}
+
 @end

Leanplum-SDK/Classes/Managers/Networking/LPRequestSender.m

@@ -96,7 +96,7 @@ - (void)sendRequest:(id<LPRequesting>)request
     }
 }
 
-- (void)sendNow:(BOOL)async request:(id<LPRequesting>)request
+- (void)sendNow:(id<LPRequesting>)request sync:(BOOL)sync
 {
     if ([request isKindOfClass:[LeanplumRequest class]]) {
         LeanplumRequest *oldLeanplumRequest = request;
@@ -114,7 +114,7 @@ - (void)sendNow:(BOOL)async request:(id<LPRequesting>)request
         }
 
         [self sendEventually:request];
-        [self sendRequests:async];
+        [self sendRequests:sync];
     }
 }
 
@@ -167,7 +167,7 @@ - (void)sendIfConnected:(id<LPRequesting>)request sync:(BOOL)sync
     } else {
         if ([[Leanplum_Reachability reachabilityForInternetConnection] isReachable]) {
             if (sync) {
-                [self sendNowSyncRequest:request];
+                [self sendNowSync:request];
             } else {
                 [self sendNow:request];
             }
@@ -183,12 +183,12 @@ - (void)sendIfConnected:(id<LPRequesting>)request sync:(BOOL)sync
 
 - (void)sendNow:(id<LPRequesting>)request
 {
-    [self sendNow:YES request:request];
+    [self sendNow:request sync:NO];
 }
 
-- (void)sendNowSyncRequest:(id<LPRequesting>)request
+- (void)sendNowSync:(id<LPRequesting>)request
 {
-    [self sendNow:NO request:request];
+    [self sendNow:request sync:YES];
 }
 
 // Wait 1 second for potential other API calls, and then sends the call synchronously
@@ -315,7 +315,7 @@ - (NSMutableDictionary *)createArgsDictionaryForRequest:(LPRequest *)request
     return args;
 }
 
-- (void)sendRequests:(BOOL)async
+- (void)sendRequests:(BOOL)sync
 {
     NSBlockOperation *requestOperation = [NSBlockOperation new];
     __weak NSBlockOperation *weakOperation = requestOperation;
@@ -348,7 +348,7 @@ - (void)sendRequests:(BOOL)async
                                                    LP_PARAM_TIME: timestamp
                                                    } mutableCopy];
         [self attachApiKeys:multiRequestArgs];
-        int timeout = async ? constants.networkTimeoutSeconds : constants.syncNetworkTimeoutSeconds;
+        int timeout = sync ? constants.syncNetworkTimeoutSeconds : constants.networkTimeoutSeconds;
 
         NSTimeInterval uiTimeoutInterval = timeout;
         timeout = 5 * timeout; // let slow operations complete
@@ -384,7 +384,7 @@ - (void)sendRequests:(BOOL)async
 
                 // Send another request if the last request had maximum events per api call.
                 if (requestsToSend.count == MAX_EVENTS_PER_API_CALL) {
-                    [self sendRequests:async];
+                    [self sendRequests:sync];
                 }
                 LP_END_TRY
 
@@ -465,7 +465,7 @@ - (void)sendRequests:(BOOL)async
 
     // Send. operationBlock will run synchronously.
     // Adding to OperationQueue puts it in the background.
-    if (async) {
+    if (!sync) {
         [requestOperation addExecutionBlock:operationBlock];
         [[self sendNowQueue] addOperation:requestOperation];
     } else {