Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 4.15.0 #342

Merged
merged 27 commits into from
Aug 31, 2018
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
2b49ddd
Consolidate WK and UI bridge register
nonelse Aug 3, 2018
a90a85d
Load adjust JS from register
nonelse Aug 3, 2018
617c565
Add fb pixel bridge
nonelse Aug 3, 2018
9d9267d
Create fb_pixel.md
nonelse Aug 3, 2018
4bb64bc
Update fb_pixel.md
nonelse Aug 3, 2018
c3fee09
Remove unecessary files and sections
nonelse Aug 3, 2018
bc1d9b6
Update logging
nonelse Aug 3, 2018
c6bd7eb
Update fb_pixel.md
hellomarne Aug 10, 2018
5976c21
Fire attribution request if none available after session tracking
uerceg Aug 17, 2018
1b3e8ef
Adding example app for Facebook Pixel integration
uerceg Aug 23, 2018
e2bb675
Update fb_pixel.md
uerceg Aug 23, 2018
77d4358
Small cleanup
uerceg Aug 23, 2018
fa888f0
Add event callback ID functionality
uerceg Aug 24, 2018
86381a3
Test app support for event callback ID
uerceg Aug 24, 2018
0ecf170
Fix fb example plist duplication
nonelse Aug 27, 2018
82f5c94
Add args to fb pixel search track
nonelse Aug 27, 2018
6a1fd3f
Refactor network package construction copying and removing parameters
nonelse Aug 28, 2018
b1b7bd4
Remove event_callback_id from packages sent
nonelse Aug 28, 2018
5fd201a
ADJUtil.m cleanup
uerceg Aug 29, 2018
0f213f6
Add callback id to web bridge
nonelse Aug 29, 2018
37e0e27
Replace response callbacks with wvjb handlers
nonelse Aug 30, 2018
ba4f9e5
New version 4.15.0
uerceg Aug 30, 2018
0303aca
Update CHANGELOG.md
uerceg Aug 30, 2018
b7560eb
Update README.md
uerceg Aug 30, 2018
8d97f60
Update CHANGELOG.md
uerceg Aug 30, 2018
b313358
Add more new version 4.15.0
nonelse Aug 31, 2018
c0aa59c
Update CHANGELOG.md
nonelse Aug 31, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -371,6 +371,14 @@ - (void)event:(NSDictionary *)parameters {
}
[adjustEvent setTransactionId:transactionId];
}

if ([parameters objectForKey:@"callbackId"]) {
NSString *callbackId = [parameters objectForKey:@"callbackId"][0];
if (callbackId == (id)[NSNull null]) {
callbackId = nil;
}
[adjustEvent setCallbackId:callbackId];
}
}

- (void)trackEvent:(NSDictionary *)parameters {
Original file line number Diff line number Diff line change
@@ -38,6 +38,7 @@ - (void)adjustEventTrackingFailed:(ADJEventFailure *)eventFailureResponseData {
[self.testLibrary addInfoToSend:@"timestamp" value:eventFailureResponseData.timeStamp];
[self.testLibrary addInfoToSend:@"adid" value:eventFailureResponseData.adid];
[self.testLibrary addInfoToSend:@"eventToken" value:eventFailureResponseData.eventToken];
[self.testLibrary addInfoToSend:@"callbackId" value:eventFailureResponseData.callbackId];
[self.testLibrary addInfoToSend:@"willRetry" value:(eventFailureResponseData.willRetry ? @"true" : @"false")];

NSError *error;
Original file line number Diff line number Diff line change
@@ -38,6 +38,7 @@ - (void)adjustEventTrackingSucceeded:(ADJEventSuccess *)eventSuccessResponseData
[self.testLibrary addInfoToSend:@"timestamp" value:eventSuccessResponseData.timeStamp];
[self.testLibrary addInfoToSend:@"adid" value:eventSuccessResponseData.adid];
[self.testLibrary addInfoToSend:@"eventToken" value:eventSuccessResponseData.eventToken];
[self.testLibrary addInfoToSend:@"callbackId" value:eventSuccessResponseData.callbackId];

NSError *error;
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:eventSuccessResponseData.jsonResponse