Commit c873800c authored by Matthijs van der Kroon's avatar Matthijs van der Kroon

Merge branch 'nov14' into 'dev'

#48

See merge request !17
parents ac93a25e 20fcbd3d
......@@ -63,7 +63,7 @@
NSMutableDictionary *payload = [NSMutableDictionary
dictionaryWithDictionary:@{@"apikey":Primed.sharedInstance.public_key,
@"ts":@(NSDate.date.timeIntervalSince1970),
@"ts":@((NSUInteger)(NSDate.date.timeIntervalSince1970 * 1000)),
@"sid":sid,
@"did":did,
@"source":@"APP",
......@@ -72,7 +72,6 @@
@"type":type.uppercaseString,
@"eventObject":(eventObject ?: @{})
}];
if(self.customBasicProperties){
[payload addEntriesFromDictionary:@{@"customProperties":self.customBasicProperties}];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment