Merge commit '7f21f85633bfbe1867a47d2c6528f0bcd7af573d' into develop

# By Menno Pruijssers
# Via Menno Pruijssers
* commit '7f21f85633bfbe1867a47d2c6528f0bcd7af573d':
  Removed nill-checks
  Changed delegates from unsafe_unretained to weak

Conflicts:
	SocketIOTransportXHR.h

Author: pkyeck

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;

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

SocketIOTransportWebsocket.h

@@ -31,6 +31,6 @@
     SRWebSocket *_webSocket;
 }
 
-@property (nonatomic, unsafe_unretained) id <SocketIOTransportDelegate> delegate;
+@property (nonatomic, weak) id <SocketIOTransportDelegate> delegate;
 
 @end

SocketIOTransportWebsocket.m

@@ -99,7 +99,9 @@ - (void) send:(NSString*)request
 
 - (void) webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message
 {
-    [delegate onData:message];
+    if([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 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 respondsToSelector:@selector(onDisconnect:)]) {
+        [delegate onDisconnect:[NSError errorWithDomain:SocketIOError
+                                                   code:SocketIOWebSocketClosed
+                                               userInfo:nil]];
+    }
 }
 
 @end

SocketIOTransportXHR.h

@@ -33,7 +33,7 @@
     BOOL _isClosed;
 }
 
-@property (nonatomic, unsafe_unretained) id <SocketIOTransportDelegate> delegate;
+@property (nonatomic, weak) id <SocketIOTransportDelegate> delegate;
 @property (nonatomic) BOOL isClosed;
 
 @end

SocketIOTransportXHR.m

@@ -247,9 +247,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 respondsToSelector:@selector(onData:)]) {
+            [messages enumerateObjectsUsingBlock:^(NSString *message, NSUInteger idx, BOOL *stop) {
+                [delegate onData:message];
+            }];
+        }
     }
 
     // remove current connection from pool