From 61eb3e88263a3f16130fbfc628a3713957123430 Mon Sep 17 00:00:00 2001 From: Brad Daily Date: Thu, 22 Sep 2016 09:08:58 -0700 Subject: [PATCH] Reverted commit D3841122 Summary: This commit brings Android in line with iOS WebSockets by sending along cookies from the shared CookieManager. See: https://github.com/facebook/react-native/pull/5630 Closes https://github.com/facebook/react-native/pull/6067 Differential Revision: D3841122 Pulled By: wutalman fbshipit-source-id: 6dae03bdf1c4599f12c0b191fcc56a61952fb59e --- .../modules/websocket/WebSocketModule.java | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java index f223c8b44..30de3ac5d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java @@ -9,9 +9,7 @@ package com.facebook.react.modules.websocket; -import android.net.Uri; import android.util.Base64; -import android.webkit.CookieManager; import java.io.IOException; import java.lang.IllegalStateException; @@ -89,27 +87,6 @@ public class WebSocketModule extends ReactContextBaseJavaModule { .tag(id) .url(url); - if (url != null) { - // Use the shared CookieManager to access the cookies - // set by WebViews inside the same app - CookieManager cookieManager = CookieManager.getInstance(); - - Uri parsedUrl = Uri.parse(url); - Uri.Builder builtUrl = parsedUrl.buildUpon(); - - // To get HTTPS-only cookies for wss URLs, - // replace wss with http in the URL. - if (parsedUrl.getScheme().equals("wss")) { - builtUrl.scheme("https"); - } - - String cookie = cookieManager.getCookie(builtUrl.build().toString()); - - if (cookie != null) { - builder.addHeader("Cookie", cookie); - } - } - if (headers != null) { ReadableMapKeySetIterator iterator = headers.keySetIterator();