From 48cb8d3f9286c8d55338bea57cda402db415a2f1 Mon Sep 17 00:00:00 2001 From: Adam Ernst Date: Thu, 8 Dec 2016 07:28:12 -0800 Subject: [PATCH] Start exposing RCTWebSocketObserver using a protocol Reviewed By: javache Differential Revision: D4296387 fbshipit-source-id: 33f92c36168dcb18356d0ccdaf902a84634d94b7 --- Libraries/WebSocket/RCTWebSocketManager.h | 3 +++ Libraries/WebSocket/RCTWebSocketManager.m | 13 +++++-------- React/Base/RCTWebSocketProxy.h | 7 +++++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Libraries/WebSocket/RCTWebSocketManager.h b/Libraries/WebSocket/RCTWebSocketManager.h index 68a97ab4983..9b076469565 100644 --- 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 +@end + @interface RCTWebSocketManager : NSObject @end diff --git a/Libraries/WebSocket/RCTWebSocketManager.m b/Libraries/WebSocket/RCTWebSocketManager.m index f577ae2e042..a9330899c60 100644 --- a/Libraries/WebSocket/RCTWebSocketManager.m +++ b/Libraries/WebSocket/RCTWebSocketManager.m @@ -20,18 +20,15 @@ #pragma mark - RCTWebSocketObserver -@interface RCTWebSocketObserver : NSObject { +@interface RCTWebSocketObserver () +@end + +@implementation RCTWebSocketObserver { NSURL *_url; RCTSRWebSocket *_socket; } -- (instancetype)initWithURL:(NSURL *)url; - -@property (nonatomic, weak) id delegate; - -@end - -@implementation RCTWebSocketObserver +@synthesize delegate = _delegate; - (instancetype)initWithURL:(NSURL *)url { diff --git a/React/Base/RCTWebSocketProxy.h b/React/Base/RCTWebSocketProxy.h index 3701d605d26..692e687fd67 100644 --- 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 delegate; +@end + @protocol RCTWebSocketProxy + (instancetype)sharedInstance;