Changed delegates from unsafe_unretained to weak

mennopruijssers · mennopruijssers · commit 94a9749787af · 2013-10-23T14:40:29.000+02:00
diff --git a/SocketIO.h b/SocketIO.h
@@ -67,7 +67,7 @@ typedef enum {
     NSString *_endpoint;
     NSDictionary *_params;
     
-    __unsafe_unretained id<SocketIODelegate> _delegate;
+    __weak id<SocketIODelegate> _delegate;
     
     NSObject <SocketIOTransport> *_transport;
     
@@ -100,7 +100,7 @@ typedef enum {
 @property (nonatomic, readonly) NSTimeInterval heartbeatTimeout;
 @property (nonatomic) BOOL useSecure;
 @property (nonatomic, readonly) BOOL isConnected, isConnecting;
-@property (nonatomic, unsafe_unretained) id<SocketIODelegate> delegate;
+@property (nonatomic, weak) id<SocketIODelegate> delegate;
 @property (nonatomic) BOOL returnAllDataFromAck;
 
 - (id) initWithDelegate:(id<SocketIODelegate>)delegate;
diff --git a/SocketIO.m b/SocketIO.m
@@ -324,7 +324,7 @@ - (void) send:(SocketIOPacket *)packet
         DEBUGLOG(@"send() >>> %@", req);
         [_transport send:req];
         
-        if ([_delegate respondsToSelector:@selector(socketIO:didSendMessage:)]) {
+        if (_delegate && [_delegate respondsToSelector:@selector(socketIO:didSendMessage:)]) {
             [_delegate socketIO:self didSendMessage:packet];
         }
     }
@@ -361,7 +361,7 @@ - (void) onConnect:(SocketIOPacket *)packet
     
     _isConnecting = NO;
     
-    if ([_delegate respondsToSelector:@selector(socketIODidConnect:)]) {
+    if (_delegate && [_delegate respondsToSelector:@selector(socketIODidConnect:)]) {
         [_delegate socketIODidConnect:self];
     }
     
@@ -517,7 +517,7 @@ - (void) onData:(NSString *)data
             case 3: {
                 DEBUGLOG(@"message");
                 if (packet.data && ![packet.data isEqualToString:@""]) {
-                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveMessage:)]) {
+                    if (_delegate && [_delegate respondsToSelector:@selector(socketIO:didReceiveMessage:)]) {
                         [_delegate socketIO:self didReceiveMessage:packet];
                     }
                 }
@@ -526,7 +526,7 @@ - (void) onData:(NSString *)data
             case 4: {
                 DEBUGLOG(@"json");
                 if (packet.data && ![packet.data isEqualToString:@""]) {
-                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveJSON:)]) {
+                    if (_delegate && [_delegate respondsToSelector:@selector(socketIO:didReceiveJSON:)]) {
                         [_delegate socketIO:self didReceiveJSON:packet];
                     }
                 }
@@ -538,7 +538,7 @@ - (void) onData:(NSString *)data
                     NSDictionary *json = [packet dataAsJSON];
                     packet.name = [json objectForKey:@"name"];
                     packet.args = [json objectForKey:@"args"];
-                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveEvent:)]) {
+                    if (_delegate && [_delegate respondsToSelector:@selector(socketIO:didReceiveEvent:)]) {
                         [_delegate socketIO:self didReceiveEvent:packet];
                     }
                 }
@@ -623,15 +623,15 @@ - (void) onDisconnect:(NSError *)error
     }
     
     if ((wasConnected || wasConnecting)) {
-        if ([_delegate respondsToSelector:@selector(socketIODidDisconnect:disconnectedWithError:)]) {
+        if (_delegate && [_delegate respondsToSelector:@selector(socketIODidDisconnect:disconnectedWithError:)]) {
             [_delegate socketIODidDisconnect:self disconnectedWithError:error];
         }
     }
 }
 
 - (void) onError:(NSError *)error
 {
-    if ([_delegate respondsToSelector:@selector(socketIO:onError:)]) {
+    if (_delegate && [_delegate respondsToSelector:@selector(socketIO:onError:)]) {
         [_delegate socketIO:self onError:error];
     }
 }
@@ -675,7 +675,7 @@ - (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)er
     _isConnected = NO;
     _isConnecting = NO;
     
-    if ([_delegate respondsToSelector:@selector(socketIO:onError:)]) {
+    if (_delegate && [_delegate respondsToSelector:@selector(socketIO:onError:)]) {
         NSMutableDictionary *errorInfo = [NSDictionary dictionaryWithObject:error forKey:NSLocalizedDescriptionKey];
         
         NSError *err = [NSError errorWithDomain:SocketIOError
@@ -685,7 +685,7 @@ - (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)er
         [_delegate socketIO:self onError:err];
     }
     // TODO: deprecated - to be removed
-    else if ([_delegate respondsToSelector:@selector(socketIOHandshakeFailed:)]) {
+    else if (_delegate && [_delegate respondsToSelector:@selector(socketIOHandshakeFailed:)]) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
         [_delegate socketIOHandshakeFailed:self];
@@ -765,11 +765,11 @@ - (void) connectionDidFinishLoading:(NSURLConnection *)connection
                                     userInfo:nil];
         }
 
-        if ([_delegate respondsToSelector:@selector(socketIO:onError:)]) {
+        if (_delegate && [_delegate respondsToSelector:@selector(socketIO:onError:)]) {
             [_delegate socketIO:self onError:error];
         }
         // TODO: deprecated - to be removed
-        else if ([_delegate respondsToSelector:@selector(socketIO:failedToConnectWithError:)]) {
+        else if (_delegate && [_delegate respondsToSelector:@selector(socketIO:failedToConnectWithError:)]) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
             [_delegate socketIO:self failedToConnectWithError:error];
diff --git a/SocketIOTransport.h b/SocketIOTransport.h
@@ -45,6 +45,6 @@
 - (BOOL) isReady;
 - (void) send:(NSString *)request;
 
-@property (nonatomic, unsafe_unretained) id <SocketIOTransportDelegate> delegate;
+@property (nonatomic, weak) id <SocketIOTransportDelegate> delegate;
 
 @end
diff --git a/SocketIOTransportWebsocket.h b/SocketIOTransportWebsocket.h
@@ -31,6 +31,6 @@
     SRWebSocket *_webSocket;
 }
 
-@property (nonatomic, unsafe_unretained) id <SocketIOTransportDelegate> delegate;
+@property (nonatomic, weak) id <SocketIOTransportDelegate> delegate;
 
 @end
diff --git a/SocketIOTransportWebsocket.m b/SocketIOTransportWebsocket.m
@@ -99,7 +99,9 @@ - (void) send:(NSString*)request
 
 - (void) webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message
 {
-    [delegate onData:message];
+    if(delegate && [delegate respondsToSelector:@selector(onData:)]) {
+        [delegate onData:message];
+    }
 }
 
 - (void) webSocketDidOpen:(SRWebSocket *)webSocket
@@ -111,7 +113,9 @@ - (void) webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error
 {
     DEBUGLOG(@"Socket failed with error ... %@", [error localizedDescription]);
     // Assuming this resulted in a disconnect
-    [delegate onDisconnect:error];
+    if(delegate && [delegate respondsToSelector:@selector(onDisconnect:)]) {
+        [delegate onDisconnect:error];
+    }
 }
 
 - (void) webSocket:(SRWebSocket *)webSocket
@@ -120,9 +124,11 @@ - (void) webSocket:(SRWebSocket *)webSocket
           wasClean:(BOOL)wasClean
 {
     DEBUGLOG(@"Socket closed. %@", reason);
-    [delegate onDisconnect:[NSError errorWithDomain:SocketIOError
-                                               code:SocketIOWebSocketClosed
-                                           userInfo:nil]];
+    if(delegate && [delegate respondsToSelector:@selector(onDisconnect:)]) {
+        [delegate onDisconnect:[NSError errorWithDomain:SocketIOError
+                                                   code:SocketIOWebSocketClosed
+                                               userInfo:nil]];
+    }
 }
 
 @end
diff --git a/SocketIOTransportXHR.h b/SocketIOTransportXHR.h
@@ -32,6 +32,6 @@
     NSMutableDictionary *_polls;
 }
 
-@property (nonatomic, unsafe_unretained) id <SocketIOTransportDelegate> delegate;
+@property (nonatomic, weak) id <SocketIOTransportDelegate> delegate;
 
 @end
diff --git a/SocketIOTransportXHR.m b/SocketIOTransportXHR.m
@@ -194,7 +194,7 @@ - (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)er
         [errorInfo setValue:[error localizedDescription] forKey:@"reason"];
         [errorInfo setValue:data forKey:@"data"];
         
-        if ([delegate respondsToSelector:@selector(onError:)]) {
+        if (delegate && [delegate respondsToSelector:@selector(onError:)]) {
             [delegate onError:[NSError errorWithDomain:SocketIOError
                                                   code:SocketIODataCouldNotBeSend
                                               userInfo:errorInfo]];
@@ -240,9 +240,11 @@ - (void) connectionDidFinishLoading:(NSURLConnection *)connection
     
     if (![message isEqualToString:@"1"]) {
         NSArray *messages = [self packetsFromPayload:message];
-        [messages enumerateObjectsUsingBlock:^(NSString *message, NSUInteger idx, BOOL *stop) {
-            [delegate onData:message];
-        }];
+        if(delegate && [delegate respondsToSelector:@selector(onData:)]) {
+            [messages enumerateObjectsUsingBlock:^(NSString *message, NSUInteger idx, BOOL *stop) {
+                [delegate onData:message];
+            }];
+        }
     }
     
     // remove current connection from pool

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ - (void) send:(SocketIOPacket *)packet`
`324`	`324`	`DEBUGLOG(@"send() >>> %@", req);`
`325`	`325`	`[_transport send:req];`
`326`	`326`
`327`		`- if ([_delegate respondsToSelector:@selector(socketIO:didSendMessage:)]) {`
	`327`	`+ if (_delegate && [_delegate respondsToSelector:@selector(socketIO:didSendMessage:)]) {`
`328`	`328`	`[_delegate socketIO:self didSendMessage:packet];`
`329`	`329`	`}`
`330`	`330`	`}`
`@@ -361,7 +361,7 @@ - (void) onConnect:(SocketIOPacket *)packet`
`361`	`361`
`362`	`362`	`_isConnecting = NO;`
`363`	`363`
`364`		`- if ([_delegate respondsToSelector:@selector(socketIODidConnect:)]) {`
	`364`	`+ if (_delegate && [_delegate respondsToSelector:@selector(socketIODidConnect:)]) {`
`365`	`365`	`[_delegate socketIODidConnect:self];`
`366`	`366`	`}`
`367`	`367`
`@@ -517,7 +517,7 @@ - (void) onData:(NSString *)data`
`517`	`517`	`case 3: {`
`518`	`518`	`DEBUGLOG(@"message");`
`519`	`519`	`if (packet.data && ![packet.data isEqualToString:@""]) {`
`520`		`- if ([_delegate respondsToSelector:@selector(socketIO:didReceiveMessage:)]) {`
	`520`	`+ if (_delegate && [_delegate respondsToSelector:@selector(socketIO:didReceiveMessage:)]) {`
`521`	`521`	`[_delegate socketIO:self didReceiveMessage:packet];`
`522`	`522`	`}`
`523`	`523`	`}`
`@@ -526,7 +526,7 @@ - (void) onData:(NSString *)data`
`526`	`526`	`case 4: {`
`527`	`527`	`DEBUGLOG(@"json");`
`528`	`528`	`if (packet.data && ![packet.data isEqualToString:@""]) {`
`529`		`- if ([_delegate respondsToSelector:@selector(socketIO:didReceiveJSON:)]) {`
	`529`	`+ if (_delegate && [_delegate respondsToSelector:@selector(socketIO:didReceiveJSON:)]) {`
`530`	`530`	`[_delegate socketIO:self didReceiveJSON:packet];`
`531`	`531`	`}`
`532`	`532`	`}`
`@@ -538,7 +538,7 @@ - (void) onData:(NSString *)data`
`538`	`538`	`NSDictionary *json = [packet dataAsJSON];`
`539`	`539`	`packet.name = [json objectForKey:@"name"];`
`540`	`540`	`packet.args = [json objectForKey:@"args"];`
`541`		`- if ([_delegate respondsToSelector:@selector(socketIO:didReceiveEvent:)]) {`
	`541`	`+ if (_delegate && [_delegate respondsToSelector:@selector(socketIO:didReceiveEvent:)]) {`
`542`	`542`	`[_delegate socketIO:self didReceiveEvent:packet];`
`543`	`543`	`}`
`544`	`544`	`}`
`@@ -623,15 +623,15 @@ - (void) onDisconnect:(NSError *)error`
`623`	`623`	`}`
`624`	`624`
`625`	`625`	`if ((wasConnected \|\| wasConnecting)) {`
`626`		`- if ([_delegate respondsToSelector:@selector(socketIODidDisconnect:disconnectedWithError:)]) {`
	`626`	`+ if (_delegate && [_delegate respondsToSelector:@selector(socketIODidDisconnect:disconnectedWithError:)]) {`
`627`	`627`	`[_delegate socketIODidDisconnect:self disconnectedWithError:error];`
`628`	`628`	`}`
`629`	`629`	`}`
`630`	`630`	`}`
`631`	`631`
`632`	`632`	`- (void) onError:(NSError *)error`
`633`	`633`	`{`
`634`		`- if ([_delegate respondsToSelector:@selector(socketIO:onError:)]) {`
	`634`	`+ if (_delegate && [_delegate respondsToSelector:@selector(socketIO:onError:)]) {`
`635`	`635`	`[_delegate socketIO:self onError:error];`
`636`	`636`	`}`
`637`	`637`	`}`
`@@ -675,7 +675,7 @@ - (void) connection:(NSURLConnection )connection didFailWithError:(NSError )er`
`675`	`675`	`_isConnected = NO;`
`676`	`676`	`_isConnecting = NO;`
`677`	`677`
`678`		`- if ([_delegate respondsToSelector:@selector(socketIO:onError:)]) {`
	`678`	`+ if (_delegate && [_delegate respondsToSelector:@selector(socketIO:onError:)]) {`
`679`	`679`	`NSMutableDictionary *errorInfo = [NSDictionary dictionaryWithObject:error forKey:NSLocalizedDescriptionKey];`
`680`	`680`
`681`	`681`	`NSError *err = [NSError errorWithDomain:SocketIOError`
`@@ -685,7 +685,7 @@ - (void) connection:(NSURLConnection )connection didFailWithError:(NSError )er`
`685`	`685`	`[_delegate socketIO:self onError:err];`
`686`	`686`	`}`
`687`	`687`	`// TODO: deprecated - to be removed`
`688`		`- else if ([_delegate respondsToSelector:@selector(socketIOHandshakeFailed:)]) {`
	`688`	`+ else if (_delegate && [_delegate respondsToSelector:@selector(socketIOHandshakeFailed:)]) {`
`689`	`689`	`#pragma clang diagnostic push`
`690`	`690`	`#pragma clang diagnostic ignored "-Wdeprecated-declarations"`
`691`	`691`	`[_delegate socketIOHandshakeFailed:self];`
`@@ -765,11 +765,11 @@ - (void) connectionDidFinishLoading:(NSURLConnection *)connection`
`765`	`765`	`userInfo:nil];`
`766`	`766`	`}`
`767`	`767`
`768`		`- if ([_delegate respondsToSelector:@selector(socketIO:onError:)]) {`
	`768`	`+ if (_delegate && [_delegate respondsToSelector:@selector(socketIO:onError:)]) {`
`769`	`769`	`[_delegate socketIO:self onError:error];`
`770`	`770`	`}`
`771`	`771`	`// TODO: deprecated - to be removed`
`772`		`- else if ([_delegate respondsToSelector:@selector(socketIO:failedToConnectWithError:)]) {`
	`772`	`+ else if (_delegate && [_delegate respondsToSelector:@selector(socketIO:failedToConnectWithError:)]) {`
`773`	`773`	`#pragma clang diagnostic push`
`774`	`774`	`#pragma clang diagnostic ignored "-Wdeprecated-declarations"`
`775`	`775`	`[_delegate socketIO:self failedToConnectWithError:error];`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@`
`31`	`31`	`SRWebSocket *_webSocket;`
`32`	`32`	`}`
`33`	`33`
`34`		`-@property (nonatomic, unsafe_unretained) id <SocketIOTransportDelegate> delegate;`
	`34`	`+@property (nonatomic, weak) id <SocketIOTransportDelegate> delegate;`
`35`	`35`
`36`	`36`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,9 @@ - (void) send:(NSString*)request`
`99`	`99`
`100`	`100`	`- (void) webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message`
`101`	`101`	`{`
`102`		`- [delegate onData:message];`
	`102`	`+ if(delegate && [delegate respondsToSelector:@selector(onData:)]) {`
	`103`	`+ [delegate onData:message];`
	`104`	`+ }`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`- (void) webSocketDidOpen:(SRWebSocket *)webSocket`
`@@ -111,7 +113,9 @@ - (void) webSocket:(SRWebSocket )webSocket didFailWithError:(NSError )error`
`111`	`113`	`{`
`112`	`114`	`DEBUGLOG(@"Socket failed with error ... %@", [error localizedDescription]);`
`113`	`115`	`// Assuming this resulted in a disconnect`
`114`		`- [delegate onDisconnect:error];`
	`116`	`+ if(delegate && [delegate respondsToSelector:@selector(onDisconnect:)]) {`
	`117`	`+ [delegate onDisconnect:error];`
	`118`	`+ }`
`115`	`119`	`}`
`116`	`120`
`117`	`121`	`- (void) webSocket:(SRWebSocket *)webSocket`
`@@ -120,9 +124,11 @@ - (void) webSocket:(SRWebSocket *)webSocket`
`120`	`124`	`wasClean:(BOOL)wasClean`
`121`	`125`	`{`
`122`	`126`	`DEBUGLOG(@"Socket closed. %@", reason);`
`123`		`- [delegate onDisconnect:[NSError errorWithDomain:SocketIOError`
`124`		`- code:SocketIOWebSocketClosed`
`125`		`- userInfo:nil]];`
	`127`	`+ if(delegate && [delegate respondsToSelector:@selector(onDisconnect:)]) {`
	`128`	`+ [delegate onDisconnect:[NSError errorWithDomain:SocketIOError`
	`129`	`+ code:SocketIOWebSocketClosed`
	`130`	`+ userInfo:nil]];`
	`131`	`+ }`
`126`	`132`	`}`
`127`	`133`
`128`	`134`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@`
`32`	`32`	`NSMutableDictionary *_polls;`
`33`	`33`	`}`
`34`	`34`
`35`		`-@property (nonatomic, unsafe_unretained) id <SocketIOTransportDelegate> delegate;`
	`35`	`+@property (nonatomic, weak) id <SocketIOTransportDelegate> delegate;`
`36`	`36`
`37`	`37`	`@end`