From 6a4a867f74ac55962b1c154b14797e37dee57be9 Mon Sep 17 00:00:00 2001
From: Lorenzo Blasa <lblasa@fb.com>
Date: Thu, 2 Dec 2021 02:23:31 -0800
Subject: [PATCH] Enable WebSockets for Android

Summary: This change effectively prioritises WebSocket over RSocket connections for Android.

Reviewed By: passy

Differential Revision: D32490095

fbshipit-source-id: 836438970f0668521ca6e7fab6c106e77f951652
---
 android/src/main/cpp/sonar.cpp                 | 5 ++---
 xplat/Flipper/FlipperConnectionManagerImpl.cpp | 4 ----
 xplat/Flipper/FlipperConnectionManagerImpl.h   | 4 ----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/android/src/main/cpp/sonar.cpp b/android/src/main/cpp/sonar.cpp
index 0375d081f..8bc8b68f8 100644
--- a/android/src/main/cpp/sonar.cpp
+++ b/android/src/main/cpp/sonar.cpp
@@ -953,9 +953,8 @@ class JFlipperClient : public jni::HybridClass<JFlipperClient> {
          securePort,
          altInsecurePort,
          altSecurePort});
-    // To switch to a WebSocket provider, uncomment the line below.
-    //    facebook::flipper::FlipperSocketProvider::setDefaultProvider(
-    //        std::make_unique<JFlipperSocketProvider>());
+    facebook::flipper::FlipperSocketProvider::setDefaultProvider(
+        std::make_unique<JFlipperSocketProvider>());
   }
 
  private:
diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.cpp b/xplat/Flipper/FlipperConnectionManagerImpl.cpp
index 2beda411a..506db8580 100644
--- a/xplat/Flipper/FlipperConnectionManagerImpl.cpp
+++ b/xplat/Flipper/FlipperConnectionManagerImpl.cpp
@@ -31,9 +31,7 @@ static constexpr int reconnectIntervalSeconds = 2;
 // To be bumped for every core platform interface change.
 static constexpr int sdkVersion = 4;
 
-#ifdef __APPLE__
 static constexpr int maxFailedSocketConnectionAttempts = 3;
-#endif
 
 using namespace folly;
 
@@ -477,7 +475,6 @@ void FlipperConnectionManagerImpl::sendLegacyCertificateRequest(
     WebSocket -> RSocket -> WebSocket -> ...
  */
 void FlipperConnectionManagerImpl::reevaluateSocketProvider() {
-#ifdef __APPLE__
   if (failedSocketConnectionAttempts < maxFailedSocketConnectionAttempts) {
     ++failedSocketConnectionAttempts;
   } else {
@@ -490,7 +487,6 @@ void FlipperConnectionManagerImpl::reevaluateSocketProvider() {
       FlipperSocketProvider::unshelveDefault();
     }
   }
-#endif
 }
 
 bool FlipperConnectionManagerImpl::isRunningInOwnThread() {
diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.h b/xplat/Flipper/FlipperConnectionManagerImpl.h
index 9a6708e09..f6461e847 100644
--- a/xplat/Flipper/FlipperConnectionManagerImpl.h
+++ b/xplat/Flipper/FlipperConnectionManagerImpl.h
@@ -75,11 +75,7 @@ class FlipperConnectionManagerImpl : public FlipperConnectionManager {
   int failedConnectionAttempts_ = 0;
   int failedSocketConnectionAttempts = 0;
 
-#ifdef __APPLE__
   bool useLegacySocketProvider = false;
-#else
-  bool useLegacySocketProvider = true;
-#endif
 
   std::shared_ptr<ConnectionContextStore> contextStore_;
   std::shared_ptr<FlipperConnectionManagerWrapper> implWrapper_;