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

Track device register and unregister

Browse Source 
Summary:
Now we get one event for every time an android or iOS device is detected by flipper.
This is different from a successfull connection. E.g. it may not have any flipper-enabled apps running.

Reviewed By: danielbuechele

Differential Revision: D13377316

fbshipit-source-id: 80e42ab0ae1c2ab50d4bec732a0fa86fcd941991
This commit is contained in:
John Knox
2018-12-10 02:19:42 -08:00
committed by Facebook Github Bot
parent f7ddf3b496
commit 140f846797
2 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/dispatcher/androidDevice.js
View File

@@ -13,19 +13,19 @@ import type BaseDevice from '../devices/BaseDevice';
import type Logger from '../fb-stubs/Logger.js';
const adb = require('adbkit-fb');
function createDevice(client, device): Promise<AndroidDevice> {
function createDevice(adbClient, device): Promise<AndroidDevice> {
return new Promise((resolve, reject) => {
const type =
device.type !== 'device' || device.id.startsWith('emulator')
? 'emulator'
: 'physical';
client.getProperties(device.id).then(async props => {
adbClient.getProperties(device.id).then(async props => {
let name = props['ro.product.model'];
if (type === 'emulator') {
name = (await getRunningEmulatorName(device.id)) || name;
}
const androidDevice = new AndroidDevice(device.id, type, name, client);
const androidDevice = new AndroidDevice(device.id, type, name, adbClient);
androidDevice.reverse();
resolve(androidDevice);
});
@@ -115,10 +115,7 @@ export default (store: Store, logger: Logger) => {
)
.map((device: BaseDevice) => device.serial);
store.dispatch({
type: 'UNREGISTER_DEVICES',
payload: new Set(deviceIDsToRemove),
});
unregisterDevices(deviceIDsToRemove);
console.error('adb server was shutdown');
setTimeout(watchAndroidDevices, 500);
} else {
@@ -128,34 +125,20 @@ export default (store: Store, logger: Logger) => {
tracker.on('add', async device => {
if (device.type !== 'offline') {
const androidDevice = await createDevice(client, device);
store.dispatch({
type: 'REGISTER_DEVICE',
payload: androidDevice,
});
registerDevice(client, device);
}
});
tracker.on('change', async device => {
if (device.type === 'offline') {
store.dispatch({
type: 'UNREGISTER_DEVICES',
payload: new Set([device.id]),
});
unregisterDevices([device.id]);
} else {
const androidDevice = await createDevice(client, device);
store.dispatch({
type: 'REGISTER_DEVICE',
payload: androidDevice,
});
registerDevice(client, device);
}
});
tracker.on('remove', device => {
store.dispatch({
type: 'UNREGISTER_DEVICES',
payload: new Set([device.id]),
});
unregisterDevices([device.id]);
});
})
.catch(err => {
@@ -171,5 +154,31 @@ export default (store: Store, logger: Logger) => {
});
};
async function registerDevice(adbClient: any, deviceData: any) {
const androidDevice = await createDevice(adbClient, deviceData);
logger.track('usage', 'register-device', {
os: 'Android',
name: androidDevice.title,
serial: androidDevice.serial,
});
store.dispatch({
type: 'REGISTER_DEVICE',
payload: androidDevice,
});
}
async function unregisterDevices(deviceIds: Array<string>) {
deviceIds.forEach(id =>
logger.track('usage', 'unregister-device', {
os: 'Android',
serial: id,
}),
);
store.dispatch({
type: 'UNREGISTER_DEVICES',
payload: new Set(deviceIds),
});
}
watchAndroidDevices();
};