Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jleandroperez committed Feb 5, 2016
2 parents 402e7ed + 2b2b105 commit 29e1331
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Simperium/SPEnvironment.m
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#endif

// TODO: Update this automatically via a script that looks at current git tag
NSString* const SPLibraryVersion = @"0.8.11";
NSString* const SPLibraryVersion = @"0.8.12";

// SSL Certificate Expiration: '2016-09-07 02:36:04 +0000' expressed as seconds since 1970
NSTimeInterval const SPCertificateExpiration = 1473215764;
Expand Down
2 changes: 1 addition & 1 deletion Simperium/SPWebSocketChannel.m
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ - (void)handleVersionResponse:(NSString *)responseString bucket:(SPBucket *)buck
NSString *key = [responseString substringToIndex:keyRange.location];
NSString *version = [responseString substringWithRange:versionRange];
NSString *payload = [responseString substringFromIndex:headerRange.location + headerRange.length];
SPLogInfo(@"Simperium received version (%@): %@", self.name, responseString);
SPLogVerbose(@"Simperium received version (%@): %@", self.name, responseString);

// With websockets, the data is wrapped up (somewhat annoyingly) in a dictionary, so unwrap it
// This processing should probably be moved off the main thread (or improved at the protocol level)
Expand Down

0 comments on commit 29e1331

Please sign in to comment.