Merge remote-tracking branch 'origin/develop'

Simperium · Nov 30, 2017 · 6855f5a · 6855f5a
2 parents bd9f742 + 396c888
commit 6855f5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Simperium/SPEnvironment.m b/Simperium/SPEnvironment.m
@@ -30,7 +30,7 @@
 #endif
 
 // TODO: Update this automatically via a script that looks at current git tag
-NSString* const SPLibraryVersion = @"0.8.19";
+NSString* const SPLibraryVersion = @"0.8.20";
 
 /// SSL Pinning
 ///

diff --git a/Simperium/SPWebSocketChannel.m b/Simperium/SPWebSocketChannel.m
@@ -429,7 +429,7 @@ - (void)handleIndexResponse:(NSString *)responseString bucket:(SPBucket *)bucket
     if ([current isKindOfClass:[NSNumber class]]) {
         current = [NSString stringWithFormat:@"%ld", (long)[current integerValue]];
     }
-    self.pendingLastChangeSignature = [current length] > 0 ? [NSString stringWithFormat:@"%@", current] : nil;
+    self.pendingLastChangeSignature = [current length] > 0 ? [NSString stringWithFormat:@"%@", current] : @"";
     self.nextMark                   = responseDict[@"mark"];
 
     // Remember all the retrieved data in case there's more to get