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

Fix infinite spinner after cert exchange

Browse Source 
Summary:
After the '(Outdated SDK)' addition to apps when they need to be updated, the uninitilaized clients weren't matching up with the fully initialized ones, so instead of being replaced by the full client in the side bar, they sit there forever looking like they are loading.

This applies the same name change to both fully and non-initialized clients so they always match up.

Reviewed By: passy

Differential Revision: D17501718

fbshipit-source-id: 6f2090b717a17c16c2cff37701e184363c82d36f
This commit is contained in:
John Knox
2019-09-23 06:18:38 -07:00
committed by Facebook Github Bot
parent 741fb7d292
commit 976101449d
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/server.tsx
View File

@@ -39,6 +39,17 @@ declare interface Server {
on(event: 'clients-change', callback: () => void): this;
}
function appNameWithUpdateHint(query: ClientQuery): string {
// in previous version (before 3), app may not appear in correct device
// section because it refers to the name given by client which is not fixed
// for android emulators, so it is indicated as outdated so that developers
// might want to update SDK to get rid of this connection swap problem
if (!query.sdk_version || query.sdk_version < 3) {
return query.app + ' (Outdated SDK)';
}
return query.app;
}
class Server extends EventEmitter {
connections: Map<string, ClientInfo>;
secureServer: Promise<RSocketServer<any, any>> | null;
@@ -174,7 +185,7 @@ class Server extends EventEmitter {
const client: UninitializedClient = {
os: clientData.os,
deviceName: clientData.device,
appName: clientData.app,
appName: appNameWithUpdateHint(clientData),
};
this.emit('start-client-setup', client);
@@ -312,13 +323,7 @@ class Server extends EventEmitter {
: Promise.resolve(query.device_id)
).then(csrId => {
query.device_id = csrId;
// in previous version (before 3), app may not appear in correct device
// section because it refers to the name given by client which is not fixed
// for android emulators, so it is indicated as outdated so that developers
// might want to update SDK to get rid of this connection swap problem
if (!query.sdk_version || query.sdk_version < 3) {
query.app += ' (Outdated SDK)';
}
query.app = appNameWithUpdateHint(query);
const id = `${query.app}#${query.os}#${query.device}#${csrId}`;
console.debug(`Device connected: ${id}`, 'server');