From b7d8641a286c1021248e0c66f979939548a25bf7 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Fri, 31 Jul 2020 10:41:20 -0700 Subject: [PATCH] Cleanup ForwardingCookieHandler class Summary: This diff cleansup the class ForwardingCookieHandler, refactoring constants and adding annotations to avoid lint errors changelog: [Internal] Reviewed By: JoshuaGross Differential Revision: D22771914 fbshipit-source-id: 4fdff2df5ea103f93519c2f4504288202114b1fc --- .../bridge/queue/ReactQueueConfigurationSpec.java | 2 +- .../react/modules/network/ForwardingCookieHandler.java | 10 ++++++---- .../react/modules/network/OkHttpClientProvider.java | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java index e51b4608425..dd31f88fd5f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java @@ -45,7 +45,7 @@ public class ReactQueueConfigurationSpec { public static ReactQueueConfigurationSpec createDefault() { MessageQueueThreadSpec spec = - Build.VERSION.SDK_INT < 21 + Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP ? MessageQueueThreadSpec.newBackgroundThreadSpec( "native_modules", LEGACY_STACK_SIZE_BYTES) : MessageQueueThreadSpec.newBackgroundThreadSpec("native_modules"); diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java index c77906f47e8..d1fce6275e5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java @@ -40,8 +40,9 @@ public class ForwardingCookieHandler extends CookieHandler { private static final String VERSION_ONE_HEADER = "Set-cookie2"; private static final String COOKIE_HEADER = "Cookie"; - // As CookieManager was synchronous before API 21 this class emulates the async behavior on <21. - private static final boolean USES_LEGACY_STORE = Build.VERSION.SDK_INT < 21; + // As CookieManager was synchronous before API 21 this class emulates the async behavior on < 21. + private static final boolean USES_LEGACY_STORE = + Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP; private final CookieSaver mCookieSaver; private final ReactContext mContext; @@ -100,6 +101,7 @@ public class ForwardingCookieHandler extends CookieHandler { } } + @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void clearCookiesAsync(final Callback callback) { CookieManager cookieManager = getCookieManager(); if (cookieManager != null) { @@ -148,7 +150,7 @@ public class ForwardingCookieHandler extends CookieHandler { } } - @TargetApi(21) + @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void addCookieAsync(String url, String cookie) { CookieManager cookieManager = getCookieManager(); if (cookieManager != null) { @@ -266,7 +268,7 @@ public class ForwardingCookieHandler extends CookieHandler { }); } - @TargetApi(21) + @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void flush() { CookieManager cookieManager = getCookieManager(); if (cookieManager != null) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java index 8205f96e47b..5515eeb8d95 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java @@ -116,8 +116,8 @@ public class OkHttpClientProvider { specs.add(ConnectionSpec.CLEARTEXT); client.connectionSpecs(specs); - } catch (Exception exc) { - FLog.e("OkHttpClientProvider", "Error while enabling TLS 1.2", exc); + } catch (Exception ex) { + FLog.e("OkHttpClientProvider", "Error while enabling TLS 1.2", ex); } }