From 7a8410b55128fc2c6c82778015b93a3293ca41f7 Mon Sep 17 00:00:00 2001
From: Adam Ernst <adamjernst@fb.com>
Date: Thu, 8 Dec 2016 07:28:10 -0800
Subject: [PATCH] Clean up RCTWebSocketObserver

Summary: Avoid using properties where unnecessary; stick to only one way to modify the delegate.

Reviewed By: javache

Differential Revision: D4296351

fbshipit-source-id: 94d0e3c90904ed584f691a3f28a15a7ac450c3e1
---
 Libraries/WebSocket/RCTWebSocketManager.m | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Libraries/WebSocket/RCTWebSocketManager.m b/Libraries/WebSocket/RCTWebSocketManager.m
index d863db997f8..f577ae2e042 100644
--- a/Libraries/WebSocket/RCTWebSocketManager.m
+++ b/Libraries/WebSocket/RCTWebSocketManager.m
@@ -22,23 +22,21 @@
 
 @interface RCTWebSocketObserver : NSObject <RCTSRWebSocketDelegate> {
   NSURL *_url;
+  RCTSRWebSocket *_socket;
 }
 
-@property (nonatomic, strong) RCTSRWebSocket *socket;
-@property (nonatomic, weak) id<RCTWebSocketProxyDelegate> delegate;
-@property (nonatomic, strong) dispatch_semaphore_t socketOpenSemaphore;
+- (instancetype)initWithURL:(NSURL *)url;
 
-- (instancetype)initWithURL:(NSURL *)url delegate:(id<RCTWebSocketProxyDelegate>)delegate;
+@property (nonatomic, weak) id<RCTWebSocketProxyDelegate> delegate;
 
 @end
 
 @implementation RCTWebSocketObserver
 
-- (instancetype)initWithURL:(NSURL *)url delegate:(id<RCTWebSocketProxyDelegate>)delegate
+- (instancetype)initWithURL:(NSURL *)url
 {
   if ((self = [self init])) {
     _url = url;
-    _delegate = delegate;
 }
   return self;
 }
@@ -131,7 +129,8 @@
       observer.delegate = delegate;
     }
   } else {
-    RCTWebSocketObserver *newObserver = [[RCTWebSocketObserver alloc] initWithURL:url delegate:delegate];
+    RCTWebSocketObserver *newObserver = [[RCTWebSocketObserver alloc] initWithURL:url];
+    newObserver.delegate = delegate;
     [newObserver start];
     _sockets[key] = newObserver;
   }