Fixed issue where ADB would be initialised, despite being disabled in settings

Summary:
As reported here: https://github.com/facebook/flipper/issues/2873, ADB would be initialised, even when disabled explicitly, resulting in an error if ADB could not be found.

Changelog: Fix: made sure that the "Android disabled" setting is respected.

Reviewed By: lblasa

Differential Revision: D31019099

fbshipit-source-id: 9d57945f2c21655426da42eb976dd46d8605d007

desktop/app/src/server/comms/ServerController.tsx

@@ -219,6 +219,22 @@ class ServerController extends EventEmitter implements ServerEventsListener {
 
   onSecureConnectionAttempt(clientQuery: SecureClientQuery): void {
     this.logger.track('usage', 'trusted-request-handler-called', clientQuery);
+
+    const {os, app, device_id} = clientQuery;
+    // without these checks, the user might see a connection timeout error instead, which would be much harder to track down
+    if (os === 'iOS' && !this.flipperServer.config.enableIOS) {
+      console.error(
+        `Refusing connection from ${app} on ${device_id}, since iOS support is disabled in settings`,
+      );
+      return;
+    }
+    if (os === 'Android' && !this.flipperServer.config.enableAndroid) {
+      console.error(
+        `Refusing connection from ${app} on ${device_id}, since Android support is disabled in settings`,
+      );
+      return;
+    }
+
     this.connectionTracker.logConnectionAttempt(clientQuery);
 
     if (this.timeHandlers.get(clientQueryToKey(clientQuery))) {

desktop/app/src/server/utils/CertificateProvider.tsx

@@ -73,6 +73,8 @@ export type SecureServerConfig = {
 
 type CertificateProviderConfig = {
   idbPath: string;
+  enableAndroid: boolean;
+  enableIOS: boolean;
   androidHome: string;
   enablePhysicalIOS: boolean;
 };
@@ -90,11 +92,18 @@ type CertificateProviderConfig = {
  */
 export default class CertificateProvider {
   logger: Logger;
-  adb: Promise<ADBClient>;
+  _adb: Promise<ADBClient> | undefined;
   certificateSetup: Promise<void>;
   config: CertificateProviderConfig;
   server: ServerController;
 
+  get adb(): Promise<ADBClient> {
+    if (this.config.enableAndroid) {
+      return this._adb!;
+    }
+    throw new Error('Android is not enabled in settings');
+  }
+
   constructor(
     server: ServerController,
     logger: Logger,
@@ -102,7 +111,8 @@ export default class CertificateProvider {
   ) {
     this.logger = logger;
     // TODO: refactor this code to create promise lazily
-    this.adb = getAdbClient(config).catch((e) => {
+    this._adb = config.enableAndroid
+      ? (getAdbClient(config).catch((e) => {
           // make sure initialization failure is already logged
           message.error({
             duration: 10,
@@ -111,8 +121,9 @@ export default class CertificateProvider {
               e,
           });
           console.error('Failed to initialise ADB', e);
-      this.adb = Promise.reject(e);
-    }) as Promise<ADBClient>;
+          this._adb = Promise.reject(e);
+        }) as Promise<ADBClient>)
+      : undefined;
     if (isTest()) {
       this.certificateSetup = Promise.reject(
         new Error('Server certificates not available in test'),