diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-06-29 10:32:51 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-07-03 13:37:54 +0200 |
| commit | 01edba25d502ebaefedaa245ee4b48b888db811d (patch) | |
| tree | 933c6757711226679aea4e22e9663d4a68311b66 | |
| parent | 0696670e228b9da8cabbeb81b7c2786f0994fdfb (diff) | |
| download | mullvadvpn-01edba25d502ebaefedaa245ee4b48b888db811d.tar.xz mullvadvpn-01edba25d502ebaefedaa245ee4b48b888db811d.zip | |
Rename daemon-connect events
| -rw-r--r-- | app/app.android.js | 2 | ||||
| -rw-r--r-- | app/app.js | 6 | ||||
| -rw-r--r-- | app/main.js | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/app.android.js b/app/app.android.js index 8158922673..e16c3cc6a6 100644 --- a/app/app.android.js +++ b/app/app.android.js @@ -22,7 +22,7 @@ const store = configureStore(initialState, memoryHistory); ////////////////////////////////////////////////////////////////////////// const backend = new Backend(store); -DeviceEventEmitter.addListener('com.mullvad.daemon-connection', async (_event, args) => { +DeviceEventEmitter.addListener('com.mullvad.daemon-connection-ready', async (_event, args) => { backend.setCredentials(args.credentials); backend.sync(); try { diff --git a/app/app.js b/app/app.js index f4a709ba10..d2eacfe751 100644 --- a/app/app.js +++ b/app/app.js @@ -22,12 +22,12 @@ const memoryHistory = createMemoryHistory(); const store = configureStore(initialState, memoryHistory); class CredentialsProvider implements RpcCredentialsProvider { - async request(): Promise<RpcCredentials> { + request(): Promise<RpcCredentials> { return new Promise((resolve, _reject) => { - ipcRenderer.once('daemon-connection', async (_event, credentials: RpcCredentials) => { + ipcRenderer.once('daemon-connection-ready', (_event, credentials: RpcCredentials) => { resolve(credentials); }); - ipcRenderer.send('daemon-connection'); + ipcRenderer.send('discover-daemon-connection'); }); } } diff --git a/app/main.js b/app/main.js index fd436f6f15..965d8b8eb3 100644 --- a/app/main.js +++ b/app/main.js @@ -133,7 +133,7 @@ const ApplicationMain = { }, _registerIpcListeners() { - ipcMain.on('daemon-connection', async (event) => { + ipcMain.on('discover-daemon-connection', async (event) => { const addressFile = new RpcAddressFile(); log.debug(`Waiting for RPC address file: "${addressFile.filePath}"`); @@ -165,7 +165,7 @@ const ApplicationMain = { log.debug('Read RPC connection info', credentials.connectionString); - event.sender.send('daemon-connection', credentials); + event.sender.send('daemon-connection-ready', credentials); } catch (error) { log.error(`Cannot parse the RPC address file: ${error.message}`); return; |
