jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove global access to adb client and idb config

Browse Source 
Summary: Idb and adb sholuld not really be accessed out side of Adnroid and iOS device managers

Reviewed By: lawrencelomax

Differential Revision: D33915162

fbshipit-source-id: 0d1bb028b9a53254cf5b0ce6289ae76339c5a254
This commit is contained in:
Andrey Goncharov
2022-02-02 03:05:34 -08:00
committed by Facebook GitHub Bot
parent 51ef1810b2
commit c7492a83c7
6 changed files with 14 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
desktop/flipper-server-core/src/FlipperServerImpl.tsx
View File

@@ -46,8 +46,7 @@ import {promises} from 'fs';
// Electron 11 runs on Node 12 which does not support fs.promises.rm
import rm from 'rimraf';
import assert from 'assert';
import {setAdbClient} from './devices/android/adbClient';
import {setIdbConfig} from './devices/ios/idbConfig';
import {initializeAdbClient} from './devices/android/adbClient';
import {assertNotNull} from './comms/Utilities';
const {access, copyFile, mkdir, unlink, stat, readlink, readFile, writeFile} =
@@ -163,7 +162,7 @@ export class FlipperServerImpl implements FlipperServer {
const asyncDeviceListenersPromises: Array<Promise<void>> = [];
if (this.config.settings.enableAndroid) {
asyncDeviceListenersPromises.push(
setAdbClient(this.config.settings)
initializeAdbClient(this.config.settings)
.then((adbClient) => {
if (!adbClient) {
return;
@@ -180,8 +179,7 @@ export class FlipperServerImpl implements FlipperServer {
);
}
if (this.config.settings.enableIOS) {
const idbConfig = setIdbConfig(this.config.settings);
this.ios = new IOSDeviceManager(this, idbConfig);
this.ios = new IOSDeviceManager(this, this.config.settings);
asyncDeviceListenersPromises.push(
this.ios.watchIOSDevices().catch((e) => {
console.error(