From 2b0c4591e27e4a753c093ff4b7f0a5eb3a2f38ef Mon Sep 17 00:00:00 2001 From: Adam Ernst Date: Thu, 8 Dec 2016 07:28:14 -0800 Subject: [PATCH] Rename RCTWebSocketManager file to reflect its new contents Reviewed By: javache Differential Revision: D4296615 fbshipit-source-id: a48da3f0550398cb59478c7405fe971f9246910f --- .../RCTWebSocket.xcodeproj/project.pbxproj | 16 ++++++++-------- ...WebSocketManager.h => RCTWebSocketObserver.h} | 0 ...WebSocketManager.m => RCTWebSocketObserver.m} | 2 +- React/Base/RCTWebSocketProxy.h | 10 ---------- React/Base/RCTWebSocketProxyDelegate.h | 2 -- 5 files changed, 9 insertions(+), 21 deletions(-) rename Libraries/WebSocket/{RCTWebSocketManager.h => RCTWebSocketObserver.h} (100%) rename Libraries/WebSocket/{RCTWebSocketManager.m => RCTWebSocketObserver.m} (98%) diff --git a/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj b/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj index 5afa6a072..3a800cd5f 100644 --- a/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj +++ b/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj @@ -11,10 +11,10 @@ 1338BBE11B04ACC80064A9C9 /* RCTWebSocketExecutor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDF1B04ACC80064A9C9 /* RCTWebSocketExecutor.m */; }; 2D3B5F3D1D9B165B00451313 /* RCTSRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDD1B04ACC80064A9C9 /* RCTSRWebSocket.m */; }; 2D3B5F3E1D9B165B00451313 /* RCTWebSocketExecutor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDF1B04ACC80064A9C9 /* RCTWebSocketExecutor.m */; }; - 2D3B5F3F1D9B165B00451313 /* RCTWebSocketManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB9106E1C74B1ED00838BBE /* RCTWebSocketManager.m */; }; + 2D3B5F3F1D9B165B00451313 /* RCTWebSocketObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB9106E1C74B1ED00838BBE /* RCTWebSocketObserver.m */; }; 2D3B5F401D9B165B00451313 /* RCTWebSocketModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C86DF7B1ADF695F0047B81A /* RCTWebSocketModule.m */; }; 3C86DF7C1ADF695F0047B81A /* RCTWebSocketModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C86DF7B1ADF695F0047B81A /* RCTWebSocketModule.m */; }; - 3DB9106F1C74B1ED00838BBE /* RCTWebSocketManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB9106E1C74B1ED00838BBE /* RCTWebSocketManager.m */; }; + 3DB9106F1C74B1ED00838BBE /* RCTWebSocketObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB9106E1C74B1ED00838BBE /* RCTWebSocketObserver.m */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -26,8 +26,8 @@ 3C86DF461ADF2C930047B81A /* libRCTWebSocket.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTWebSocket.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3C86DF7A1ADF695F0047B81A /* RCTWebSocketModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWebSocketModule.h; sourceTree = ""; }; 3C86DF7B1ADF695F0047B81A /* RCTWebSocketModule.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = RCTWebSocketModule.m; sourceTree = ""; tabWidth = 2; }; - 3DB9106D1C74B1ED00838BBE /* RCTWebSocketManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWebSocketManager.h; sourceTree = ""; }; - 3DB9106E1C74B1ED00838BBE /* RCTWebSocketManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWebSocketManager.m; sourceTree = ""; }; + 3DB9106D1C74B1ED00838BBE /* RCTWebSocketObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWebSocketObserver.h; sourceTree = ""; }; + 3DB9106E1C74B1ED00838BBE /* RCTWebSocketObserver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWebSocketObserver.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXGroup section */ @@ -38,8 +38,8 @@ 1338BBDD1B04ACC80064A9C9 /* RCTSRWebSocket.m */, 1338BBDE1B04ACC80064A9C9 /* RCTWebSocketExecutor.h */, 1338BBDF1B04ACC80064A9C9 /* RCTWebSocketExecutor.m */, - 3DB9106D1C74B1ED00838BBE /* RCTWebSocketManager.h */, - 3DB9106E1C74B1ED00838BBE /* RCTWebSocketManager.m */, + 3DB9106D1C74B1ED00838BBE /* RCTWebSocketObserver.h */, + 3DB9106E1C74B1ED00838BBE /* RCTWebSocketObserver.m */, 3C86DF7A1ADF695F0047B81A /* RCTWebSocketModule.h */, 3C86DF7B1ADF695F0047B81A /* RCTWebSocketModule.m */, 3C86DF471ADF2C930047B81A /* Products */, @@ -134,7 +134,7 @@ 2D3B5F3E1D9B165B00451313 /* RCTWebSocketExecutor.m in Sources */, 2D3B5F401D9B165B00451313 /* RCTWebSocketModule.m in Sources */, 2D3B5F3D1D9B165B00451313 /* RCTSRWebSocket.m in Sources */, - 2D3B5F3F1D9B165B00451313 /* RCTWebSocketManager.m in Sources */, + 2D3B5F3F1D9B165B00451313 /* RCTWebSocketObserver.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -145,7 +145,7 @@ 1338BBE01B04ACC80064A9C9 /* RCTSRWebSocket.m in Sources */, 3C86DF7C1ADF695F0047B81A /* RCTWebSocketModule.m in Sources */, 1338BBE11B04ACC80064A9C9 /* RCTWebSocketExecutor.m in Sources */, - 3DB9106F1C74B1ED00838BBE /* RCTWebSocketManager.m in Sources */, + 3DB9106F1C74B1ED00838BBE /* RCTWebSocketObserver.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Libraries/WebSocket/RCTWebSocketManager.h b/Libraries/WebSocket/RCTWebSocketObserver.h similarity index 100% rename from Libraries/WebSocket/RCTWebSocketManager.h rename to Libraries/WebSocket/RCTWebSocketObserver.h diff --git a/Libraries/WebSocket/RCTWebSocketManager.m b/Libraries/WebSocket/RCTWebSocketObserver.m similarity index 98% rename from Libraries/WebSocket/RCTWebSocketManager.m rename to Libraries/WebSocket/RCTWebSocketObserver.m index 61d96da9d..42605fc91 100644 --- a/Libraries/WebSocket/RCTWebSocketManager.m +++ b/Libraries/WebSocket/RCTWebSocketObserver.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTWebSocketManager.h" +#import "RCTWebSocketObserver.h" #import #import diff --git a/React/Base/RCTWebSocketProxy.h b/React/Base/RCTWebSocketProxy.h index 9587af7dd..3eedea187 100644 --- a/React/Base/RCTWebSocketProxy.h +++ b/React/Base/RCTWebSocketProxy.h @@ -20,14 +20,4 @@ - (void)start; @end -@protocol RCTWebSocketProxy - -+ (instancetype)sharedInstance; - -- (void)setDelegate:(id)delegate forURL:(NSURL *)url; - -- (instancetype)init __attribute__((unavailable("init not available, call sharedInstance instead"))); - -@end - #endif diff --git a/React/Base/RCTWebSocketProxyDelegate.h b/React/Base/RCTWebSocketProxyDelegate.h index fe58a09b3..278ddc884 100644 --- a/React/Base/RCTWebSocketProxyDelegate.h +++ b/React/Base/RCTWebSocketProxyDelegate.h @@ -11,8 +11,6 @@ #if RCT_DEV // Only supported in dev mode -@protocol RCTWebSocketProxy; - @protocol RCTWebSocketProxyDelegate - (void)didReceiveWebSocketMessage:(NSDictionary *)message; @end