Start exposing RCTWebSocketObserver using a protocol

Reviewed By: javache Differential Revision: D4296387 fbshipit-source-id: 33f92c36168dcb18356d0ccdaf902a84634d94b7
facebook · Dec 12, 2016 · 48cb8d3 · 48cb8d3
1 parent 7a8410b
commit 48cb8d3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/Libraries/WebSocket/RCTWebSocketManager.h b/Libraries/WebSocket/RCTWebSocketManager.h
@@ -12,6 +12,9 @@
 
 #if RCT_DEV // Only supported in dev mode
 
+@interface RCTWebSocketObserver : NSObject <RCTWebSocketObserver>
+@end
+
 @interface RCTWebSocketManager : NSObject <RCTWebSocketProxy>
 @end
 

diff --git a/Libraries/WebSocket/RCTWebSocketManager.m b/Libraries/WebSocket/RCTWebSocketManager.m
@@ -20,18 +20,15 @@
 
 #pragma mark - RCTWebSocketObserver
 
-@interface RCTWebSocketObserver : NSObject <RCTSRWebSocketDelegate> {
+@interface RCTWebSocketObserver () <RCTSRWebSocketDelegate>
+@end
+
+@implementation RCTWebSocketObserver {
   NSURL *_url;
   RCTSRWebSocket *_socket;
 }
 
-- (instancetype)initWithURL:(NSURL *)url;
-
-@property (nonatomic, weak) id<RCTWebSocketProxyDelegate> delegate;
-
-@end
-
-@implementation RCTWebSocketObserver
+@synthesize delegate = _delegate;
 
 - (instancetype)initWithURL:(NSURL *)url
 {

diff --git a/React/Base/RCTWebSocketProxy.h b/React/Base/RCTWebSocketProxy.h
@@ -12,6 +12,13 @@
 
 #if RCT_DEV // Only supported in dev mode
 
+@protocol RCTWebSocketProxyDelegate;
+
+@protocol RCTWebSocketObserver
+- (instancetype)initWithURL:(NSURL *)url;
+@property (nonatomic, weak) id<RCTWebSocketProxyDelegate> delegate;
+@end
+
 @protocol RCTWebSocketProxy
 
 + (instancetype)sharedInstance;
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,9 @@ @@
     #if RCT_DEV // Only supported in dev mode
+    @interface RCTWebSocketObserver : NSObject <RCTWebSocketObserver>
+    @end
     @interface RCTWebSocketManager : NSObject <RCTWebSocketProxy>
     @end
@@ Expand Down @@