Issue #172: Preventing multiple ‘openWebSocket’ calls to get executed.

Simperium · Nov 21, 2013 · bf09a02 · bf09a02
1 parent bcf6400
commit bf09a02
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Simperium/SPWebSocketInterface.m b/Simperium/SPWebSocketInterface.m
@@ -162,11 +162,16 @@ - (void)authenticateChannel:(SPWebSocketChannel *)channel {
 }
 
 - (void)openWebSocket {
+	// Prevent multiple 'openWebSocket' calls to get executed
+	[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(openWebSocket) object:nil];
+
+	// Open the socket!
     NSString *urlString = [NSString stringWithFormat:@"%@/%@/websocket", WEBSOCKET_URL, self.simperium.appID];
     SRWebSocket *newWebSocket = [[SRWebSocket alloc] initWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:urlString]]];
     self.webSocket = newWebSocket;
     self.webSocket.delegate = self;
-
+    self.open = NO;
+
     DDLogVerbose(@"Simperium opening WebSocket connection...");
     [self.webSocket open];
 }

diff --git a/samples/Simpletodo/SimpletodoFinal/Simpletodo.xcdatamodeld/.xccurrentversion b/samples/Simpletodo/SimpletodoFinal/Simpletodo.xcdatamodeld/.xccurrentversion
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>_XCCurrentVersionName</key>
-	<string>Simpletodo.xcdatamodel</string>
-</dict>
+<dict/>
 </plist>