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

Don't do iOS-specific setup when not supported

Browse Source 
Summary:
Now flipper will include iOS devices in the dropdown, but you'll also get a message saying they aren't yet supported.
Also doesn't start up the PortForwardingMacApp instances in this case, because it's pointless.

Reviewed By: priteshrnandgaonkar

Differential Revision: D13319990

fbshipit-source-id: 75d72c6ed2478c7b999c5f43b764f097141b33de
This commit is contained in:
John Knox
2018-12-04 07:08:05 -08:00
committed by Facebook Github Bot
parent 3057c0a6e7
commit 606d689cae
3 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/dispatcher/iOSDevice.js
View File

@@ -9,8 +9,8 @@ import type {ChildProcess} from 'child_process';
import type {Store} from '../reducers/index.js';
import type Logger from '../fb-stubs/Logger.js';
import type {DeviceType} from '../devices/BaseDevice';
import {RecurringError} from '../utils/errors';
import {RecurringError} from '../utils/errors';
import {promisify} from 'util';
import path from 'path';
import child_process from 'child_process';
@@ -18,6 +18,7 @@ const execFile = child_process.execFile;
import IOSDevice from '../devices/IOSDevice';
import iosUtil from '../fb-stubs/iOSContainerUtility';
import isProduction from '../utils/isProduction.js';
import GK from '../fb-stubs/GK';
type iOSSimulatorDevice = {|
state: 'Booted' | 'Shutdown' | 'Shutting Down',
@@ -43,10 +44,9 @@ function forwardPort(port: number, multiplexChannelPort: number) {
]);
}
// start port forwarding server for real device connections
const portForwarders: Array<ChildProcess> = [
forwardPort(8089, 8079),
forwardPort(8088, 8078),
];
const portForwarders: Array<ChildProcess> = GK.get('flipper_ios_device_support')
? [forwardPort(8089, 8079), forwardPort(8088, 8078)]
: [];
window.addEventListener('beforeunload', () => {
portForwarders.forEach(process => process.kill());
});
@@ -112,12 +112,10 @@ function getActiveSimulators(): Promise<Array<IOSDeviceParams>> {
}
function getActiveDevices(): Promise<Array<IOSDeviceParams>> {
return iosUtil.isAvailable()
? iosUtil.targets().catch(e => {
console.error(new RecurringError(e.message));
return [];
})
: Promise.resolve([]);
return iosUtil.targets().catch(e => {
console.error(new RecurringError(e.message));
return [];
});
}
export default (store: Store, logger: Logger) => {