Skip to content

Commit 31ec469

Browse files
e7mace7mac
committed
Merge branch 'master' into release/2.2.5
2 parents 435c294 + d9885cf commit 31ec469

File tree

9 files changed

+42
-50
lines changed

9 files changed

+42
-50
lines changed

‎Example/Tests/Classes/LPRequestSenderTest.m‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,22 @@ - (void)testCreateArgsDictionaryForRequest {
6262
XCTAssertEqualObjects(testArgs, args);
6363
}
6464

65+
- (void)testSend {
66+
LPRequest *request = [LPRequest post:@"test" params:@{}];
67+
LPRequestSender *requestSender = [[LPRequestSender alloc] init];
68+
id requestSenderMock = OCMPartialMock(requestSender);
69+
id configMock = OCMClassMock([LPAPIConfig class]);
70+
OCMStub([configMock sharedConfig]).andReturn(configMock);
71+
OCMStub([configMock appId]).andReturn(@"appID");
72+
OCMStub([configMock accessKey]).andReturn(@"accessKey");
73+
[requestSender send:request];
74+
75+
OCMVerify([requestSenderMock sendEventually:request]);
76+
77+
[requestSenderMock stopMocking];
78+
[configMock stopMocking];
79+
}
80+
6581
- (void)testSendNow {
6682
LPRequest *request = [LPRequest post:@"test" params:@{}];
6783
LPRequestSender *requestSender = [[LPRequestSender alloc] init];

‎Leanplum-SDK.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,37 +1536,29 @@
15361536
buildActionMask = 2147483647;
15371537
files = (
15381538
);
1539-
inputFileListPaths = (
1540-
);
15411539
inputPaths = (
1542-
"${PODS_ROOT}/Target Support Files/Pods-Leanplum-iOS-Example/Pods-Leanplum-iOS-Example-frameworks.sh",
1540+
"${SRCROOT}/Pods/Target Support Files/Pods-Leanplum-iOS-Example/Pods-Leanplum-iOS-Example-frameworks.sh",
15431541
"${BUILT_PRODUCTS_DIR}/Leanplum-iOS-SDK-source/Leanplum.framework",
15441542
);
15451543
name = "[CP] Embed Pods Frameworks";
1546-
outputFileListPaths = (
1547-
);
15481544
outputPaths = (
15491545
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Leanplum.framework",
15501546
);
15511547
runOnlyForDeploymentPostprocessing = 0;
15521548
shellPath = /bin/sh;
1553-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Leanplum-iOS-Example/Pods-Leanplum-iOS-Example-frameworks.sh\"\n";
1549+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Leanplum-iOS-Example/Pods-Leanplum-iOS-Example-frameworks.sh\"\n";
15541550
showEnvVarsInLog = 0;
15551551
};
15561552
8F17F0283B37AFEA207AE526 /* [CP] Check Pods Manifest.lock */ = {
15571553
isa = PBXShellScriptBuildPhase;
15581554
buildActionMask = 2147483647;
15591555
files = (
15601556
);
1561-
inputFileListPaths = (
1562-
);
15631557
inputPaths = (
15641558
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
15651559
"${PODS_ROOT}/Manifest.lock",
15661560
);
15671561
name = "[CP] Check Pods Manifest.lock";
1568-
outputFileListPaths = (
1569-
);
15701562
outputPaths = (
15711563
"$(DERIVED_FILE_DIR)/Pods-Leanplum-tvOS-Example-checkManifestLockResult.txt",
15721564
);
@@ -1580,63 +1572,51 @@
15801572
buildActionMask = 2147483647;
15811573
files = (
15821574
);
1583-
inputFileListPaths = (
1584-
);
15851575
inputPaths = (
1586-
"${PODS_ROOT}/Target Support Files/Pods-LeanplumSDKTests/Pods-LeanplumSDKTests-frameworks.sh",
1576+
"${SRCROOT}/Pods/Target Support Files/Pods-LeanplumSDKTests/Pods-LeanplumSDKTests-frameworks.sh",
15871577
"${BUILT_PRODUCTS_DIR}/Leanplum-iOS-SDK-source/Leanplum.framework",
15881578
"${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework",
15891579
"${BUILT_PRODUCTS_DIR}/OHHTTPStubs/OHHTTPStubs.framework",
15901580
);
15911581
name = "[CP] Embed Pods Frameworks";
1592-
outputFileListPaths = (
1593-
);
15941582
outputPaths = (
15951583
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Leanplum.framework",
15961584
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework",
15971585
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OHHTTPStubs.framework",
15981586
);
15991587
runOnlyForDeploymentPostprocessing = 0;
16001588
shellPath = /bin/sh;
1601-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-LeanplumSDKTests/Pods-LeanplumSDKTests-frameworks.sh\"\n";
1589+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LeanplumSDKTests/Pods-LeanplumSDKTests-frameworks.sh\"\n";
16021590
showEnvVarsInLog = 0;
16031591
};
16041592
EF696FE2963AE44141D91048 /* [CP] Embed Pods Frameworks */ = {
16051593
isa = PBXShellScriptBuildPhase;
16061594
buildActionMask = 2147483647;
16071595
files = (
16081596
);
1609-
inputFileListPaths = (
1610-
);
16111597
inputPaths = (
1612-
"${PODS_ROOT}/Target Support Files/Pods-Leanplum-tvOS-Example/Pods-Leanplum-tvOS-Example-frameworks.sh",
1598+
"${SRCROOT}/Pods/Target Support Files/Pods-Leanplum-tvOS-Example/Pods-Leanplum-tvOS-Example-frameworks.sh",
16131599
"${BUILT_PRODUCTS_DIR}/Leanplum-tvOS-SDK-source/LeanplumTV.framework",
16141600
);
16151601
name = "[CP] Embed Pods Frameworks";
1616-
outputFileListPaths = (
1617-
);
16181602
outputPaths = (
16191603
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LeanplumTV.framework",
16201604
);
16211605
runOnlyForDeploymentPostprocessing = 0;
16221606
shellPath = /bin/sh;
1623-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Leanplum-tvOS-Example/Pods-Leanplum-tvOS-Example-frameworks.sh\"\n";
1607+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Leanplum-tvOS-Example/Pods-Leanplum-tvOS-Example-frameworks.sh\"\n";
16241608
showEnvVarsInLog = 0;
16251609
};
16261610
FE31991B4356AF7EAA1064C0 /* [CP] Check Pods Manifest.lock */ = {
16271611
isa = PBXShellScriptBuildPhase;
16281612
buildActionMask = 2147483647;
16291613
files = (
16301614
);
1631-
inputFileListPaths = (
1632-
);
16331615
inputPaths = (
16341616
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
16351617
"${PODS_ROOT}/Manifest.lock",
16361618
);
16371619
name = "[CP] Check Pods Manifest.lock";
1638-
outputFileListPaths = (
1639-
);
16401620
outputPaths = (
16411621
"$(DERIVED_FILE_DIR)/Pods-Leanplum-iOS-Example-checkManifestLockResult.txt",
16421622
);
@@ -1650,15 +1630,11 @@
16501630
buildActionMask = 2147483647;
16511631
files = (
16521632
);
1653-
inputFileListPaths = (
1654-
);
16551633
inputPaths = (
16561634
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
16571635
"${PODS_ROOT}/Manifest.lock",
16581636
);
16591637
name = "[CP] Check Pods Manifest.lock";
1660-
outputFileListPaths = (
1661-
);
16621638
outputPaths = (
16631639
"$(DERIVED_FILE_DIR)/Pods-LeanplumSDKTests-checkManifestLockResult.txt",
16641640
);

‎Leanplum-SDK/Classes/Features/Actions/LPActionManager.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ - (void)leanplum_application:(UIApplication *)application didRegisterForRemoteNo
9292
initWithFeatureFlagManager:[LPFeatureFlagManager sharedManager]];
9393
id<LPRequesting> request = [reqFactory
9494
setDeviceAttributesWithParams:@{LP_PARAM_DEVICE_PUSH_TOKEN: formattedToken}];
95-
[[LPRequestSender sharedInstance] sendRequest:request];
95+
[[LPRequestSender sharedInstance] send:request];
9696
}
9797
LP_END_TRY
9898

@@ -346,7 +346,7 @@ - (void)sendUserNotificationSettingsIfChanged:(UIUserNotificationSettings *)noti
346346
LPRequestFactory *reqFactory = [[LPRequestFactory alloc]
347347
initWithFeatureFlagManager:[LPFeatureFlagManager sharedManager]];
348348
id<LPRequesting> request = [reqFactory setDeviceAttributesWithParams:params];
349-
[[LPRequestSender sharedInstance] sendRequest:request];
349+
[[LPRequestSender sharedInstance] send:request];
350350
LP_BEGIN_USER_CODE
351351
}];
352352
}

‎Leanplum-SDK/Classes/Features/Inbox/LPInbox.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ - (void)read
193193
LPRequestFactory *reqFactory = [[LPRequestFactory alloc]
194194
initWithFeatureFlagManager:[LPFeatureFlagManager sharedManager]];
195195
id<LPRequesting> request = [reqFactory markNewsfeedMessageAsReadWithParams:params];
196-
[[LPRequestSender sharedInstance] sendRequest:request];
196+
[[LPRequestSender sharedInstance] send:request];
197197
LP_END_TRY
198198
}
199199

@@ -374,7 +374,7 @@ - (void)removeMessageForId:(NSString *)messageId
374374
LPRequestFactory *reqFactory = [[LPRequestFactory alloc]
375375
initWithFeatureFlagManager:[LPFeatureFlagManager sharedManager]];
376376
id<LPRequesting> request = [reqFactory deleteNewsfeedMessageWithParams:params];
377-
[[LPRequestSender sharedInstance] sendRequest:request];
377+
[[LPRequestSender sharedInstance] send:request];
378378
LP_END_TRY
379379
}
380380

‎Leanplum-SDK/Classes/Features/Variables/LPVarCache.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ - (BOOL)sendContentIfChanged:(BOOL)variables actions:(BOOL)actions
671671
LPRequestFactory *reqFactory = [[LPRequestFactory alloc]
672672
initWithFeatureFlagManager:[LPFeatureFlagManager sharedManager]];
673673
id<LPRequesting> request = [reqFactory setVarsWithParams:args];
674-
[[LPRequestSender sharedInstance] sendRequest:request];
674+
[[LPRequestSender sharedInstance] send:request];
675675
return YES;
676676
} @catch (NSException *e) {
677677
[Leanplum throwError:@"Cannot serialize variable values. "

‎Leanplum-SDK/Classes/Internal/LPConstants.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ void leanplumInternalError(NSException *e)
307307
@"stackTrace": [[e callStackSymbols] description] ?: @"",
308308
LP_PARAM_VERSION_NAME: versionName
309309
}];
310-
[[LPRequestSender sharedInstance] sendRequest:request];
310+
[[LPRequestSender sharedInstance] send:request];
311311
} @catch (NSException *e) {
312312
// This empty try/catch is needed to prevent crash <-> loop.
313313
}

‎Leanplum-SDK/Classes/Internal/Leanplum.m‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ + (void)startWithUserId:(NSString *)userId
10021002
LP_PARAM_TYPE: LP_VALUE_SDK_START_LATENCY,
10031003
@"startLatency": [@(latency) description]
10041004
}];
1005-
[[LPRequestSender sharedInstance] sendRequest:request];
1005+
[[LPRequestSender sharedInstance] send:request];
10061006
}
10071007
}
10081008

@@ -2036,7 +2036,7 @@ + (void)trackInternal:(NSString *)event withArgs:(NSDictionary *)args
20362036
LPRequestFactory *reqFactory = [[LPRequestFactory alloc]
20372037
initWithFeatureFlagManager:[LPFeatureFlagManager sharedManager]];
20382038
id<LPRequesting> request = [reqFactory trackWithParams:args];
2039-
[[LPRequestSender sharedInstance] sendRequest:request];
2039+
[[LPRequestSender sharedInstance] send:request];
20402040

20412041
// Perform event actions.
20422042
NSString *messageId = args[LP_PARAM_MESSAGE_ID];
@@ -2172,7 +2172,7 @@ + (void)setUserIdInternal:(NSString *)userId withAttributes:(NSDictionary *)attr
21722172
LP_PARAM_USER_ATTRIBUTES: attributes ? [LPJSON stringFromJSON:attributes] : @"",
21732173
LP_PARAM_NEW_USER_ID: userId ? userId : @""
21742174
}];
2175-
[[LPRequestSender sharedInstance] sendRequest:request];
2175+
[[LPRequestSender sharedInstance] send:request];
21762176

21772177
if (userId.length) {
21782178
[[LPAPIConfig sharedConfig] setUserId:userId];
@@ -2247,7 +2247,7 @@ + (void)setTrafficSourceInfoInternal:(NSDictionary *)info
22472247
id<LPRequesting> request = [reqFactory setTrafficSourceInfoWithParams:@{
22482248
LP_PARAM_TRAFFIC_SOURCE: info
22492249
}];
2250-
[[LPRequestSender sharedInstance] sendRequest:request];
2250+
[[LPRequestSender sharedInstance] send:request];
22512251
}
22522252

22532253
+ (void)advanceTo:(NSString *)state
@@ -2302,7 +2302,7 @@ + (void)advanceToInternal:(NSString *)state withArgs:(NSDictionary *)args
23022302
LPRequestFactory *reqFactory = [[LPRequestFactory alloc]
23032303
initWithFeatureFlagManager:[LPFeatureFlagManager sharedManager]];
23042304
id<LPRequesting> request = [reqFactory advanceWithParams:args];
2305-
[[LPRequestSender sharedInstance] sendRequest:request];
2305+
[[LPRequestSender sharedInstance] send:request];
23062306
LPContextualValues *contextualValues = [[LPContextualValues alloc] init];
23072307
contextualValues.parameters = params;
23082308
[self maybePerformActions:@[@"state"]
@@ -2331,7 +2331,7 @@ + (void)pauseStateInternal
23312331
LPRequestFactory *reqFactory = [[LPRequestFactory alloc]
23322332
initWithFeatureFlagManager:[LPFeatureFlagManager sharedManager]];
23332333
id<LPRequesting> request = [reqFactory pauseStateWithParams:@{}];
2334-
[[LPRequestSender sharedInstance] sendRequest:request];
2334+
[[LPRequestSender sharedInstance] send:request];
23352335
}
23362336

23372337
+ (void)resumeState
@@ -2353,7 +2353,7 @@ + (void)resumeStateInternal
23532353
LPRequestFactory *reqFactory = [[LPRequestFactory alloc]
23542354
initWithFeatureFlagManager:[LPFeatureFlagManager sharedManager]];
23552355
id<LPRequesting> request = [reqFactory resumeStateWithParams:@{}];
2356-
[[LPRequestSender sharedInstance] sendRequest:request];
2356+
[[LPRequestSender sharedInstance] send:request];
23572357
}
23582358

23592359
+ (void)forceContentUpdate
@@ -2776,7 +2776,7 @@ + (void)setUserLocationAttributeWithLatitude:(double)latitude
27762776
response(NO);
27772777
}
27782778
}];
2779-
[[LPRequestSender sharedInstance] sendRequest:request];
2779+
[[LPRequestSender sharedInstance] send:request];
27802780
LP_END_TRY
27812781
}
27822782

‎Leanplum-SDK/Classes/Managers/Networking/LPRequestSender.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
- (NSMutableDictionary *)createArgsDictionaryForRequest:(id<LPRequesting>)request;
3636
- (void)attachApiKeys:(NSMutableDictionary *)dict;
3737

38-
- (void)sendRequest:(id<LPRequesting>)request;
38+
- (void)send:(id<LPRequesting>)request;
3939
- (void)sendNow:(id<LPRequesting>)request;
4040
- (void)sendEventually:(id<LPRequesting>)request;
4141
- (void)sendIfConnected:(id<LPRequesting>)request;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ - (id)init
8080
return self;
8181
}
8282

83-
- (void)sendRequest:(id<LPRequesting>)request
83+
- (void)send:(id<LPRequesting>)request
8484
{
8585
if ([request isKindOfClass:[LeanplumRequest class]]) {
8686
LeanplumRequest *oldLeanplumRequest = request;
@@ -95,7 +95,7 @@ - (void)sendRequest:(id<LPRequesting>)request
9595
} else {
9696
delay = (self.lastSentTime + LP_REQUEST_DEVELOPMENT_MAX_DELAY) - currentTime;
9797
}
98-
[self performSelector:@selector(sendIfConnectedRequest:) withObject:request afterDelay:delay];
98+
[self performSelector:@selector(sendIfConnected:) withObject:request afterDelay:delay];
9999
}
100100
}
101101
[self.countAggregator incrementCount:@"send_request_lp"];
@@ -209,19 +209,19 @@ - (void)sendIfDelayed:(id<LPRequesting>)request
209209
[oldLeanplumRequest sendIfDelayed];
210210
} else {
211211
[self sendEventually:request];
212-
[self performSelector:@selector(sendIfDelayedHelperRequest:)
212+
[self performSelector:@selector(sendIfDelayedHelper:)
213213
withObject:request
214214
afterDelay:LP_REQUEST_RESUME_DELAY];
215215

216216
}
217217
}
218218

219219
// Sends the call synchronously if no other call has been sent within 1 minute.
220-
- (void)sendIfDelayedHelperRequest:(LPRequest *)request
220+
- (void)sendIfDelayedHelper:(LPRequest *)request
221221
{
222222
LP_TRY
223223
if ([LPConstantsState sharedState].isDevelopmentModeEnabled) {
224-
[self sendRequest:request];
224+
[self send:request];
225225
} else {
226226
NSTimeInterval currentTime = [NSDate timeIntervalSinceReferenceDate];
227227
if (!self.lastSentTime || currentTime - self.lastSentTime > LP_REQUEST_PRODUCTION_DELAY) {

0 commit comments

Comments
 (0)