Skip to content

Commit a29a1d3

Browse files
rozeleLukeDurrant
authored andcommitted
Revert "Remove Platform check from WebSocket module"
Summary: This reverts commit b9be289. Thank you for sending the PR! We appreciate you spending the time to work on these changes. Help us understand your motivation by explaining why you decided to make this change. <!-- Required: Write your motivation here. If this PR fixes an issue, type "Fixes #issueNumber" to automatically close the issue when the PR is merged. --> Fix facebook#18696 <!-- Required: Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Bonus points for screenshots and videos! --> Run Jest tests. Run WebSocket example from RNTester on Android. <!-- Does this PR require a documentation change? Create a PR at https://github.com/facebook/react-native-website and add a link to it here. --> <!-- Required. Help reviewers and the release process by writing your own release notes. See below for an example. --> [CATEGORY] [TYPE] [LOCATION] - Message <!-- **INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.** CATEGORY [----------] TYPE [ CLI ] [-------------] LOCATION [ DOCS ] [ BREAKING ] [-------------] [ GENERAL ] [ BUGFIX ] [ {Component} ] [ INTERNAL ] [ ENHANCEMENT ] [ {Filename} ] [ IOS ] [ FEATURE ] [ {Directory} ] |-----------| [ ANDROID ] [ MINOR ] [ {Framework} ] - | {Message} | [----------] [-------------] [-------------] |-----------| EXAMPLES: [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see --> [ANDROID][BUGFIX][WebSocketModule] - revert change that regresses WebSocketModule Closes facebook#18733 Differential Revision: D7548850 Pulled By: hramos fbshipit-source-id: b8c79810c1cd6e5a30ec4118bd5ff8ad719f04b9
1 parent 57206f5 commit a29a1d3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Libraries/WebSocket/WebSocket.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const EventTarget = require('event-target-shim');
1414
const NativeEventEmitter = require('NativeEventEmitter');
1515
const BlobManager = require('BlobManager');
1616
const NativeModules = require('NativeModules');
17+
const Platform = require('Platform');
1718
const WebSocketEvent = require('WebSocketEvent');
1819

1920
/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
@@ -205,7 +206,7 @@ class WebSocket extends EventTarget(...WEBSOCKET_EVENTS) {
205206
}
206207

207208
_close(code?: number, reason?: string): void {
208-
if (WebSocketModule.close.length === 3) {
209+
if (Platform.OS === 'android') {
209210
// See https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
210211
const statusCode = typeof code === 'number' ? code : CLOSE_NORMAL;
211212
const closeReason = typeof reason === 'string' ? reason : '';

0 commit comments

Comments
 (0)