Skip to content

Commit 4a5ffd9

Browse files
author
Brendan Mulholland
committed
chore: Replace remote for setting auto-open pref
1 parent 1cd043a commit 4a5ffd9

File tree

3 files changed

+16
-19
lines changed

3 files changed

+16
-19
lines changed

main.js

+10-6
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,16 @@ menubarApp.on('ready', () => {
6666
}
6767
});
6868

69+
ipcMain.handle('get-platform', async () => {
70+
return process.platform;
71+
});
72+
ipcMain.handle('get-app-version', async () => {
73+
return app.getVersion();
74+
});
75+
6976
ipcMain.on('reopen-window', () => menubarApp.showWindow());
7077
ipcMain.on('hide-window', () => menubarApp.hideWindow());
78+
7179
ipcMain.on('app-quit', () => menubarApp.app.quit());
7280
ipcMain.on('update-icon', (_, arg) => {
7381
if (!menubarApp.tray.isDestroyed()) {
@@ -78,12 +86,8 @@ menubarApp.on('ready', () => {
7886
}
7987
}
8088
});
81-
ipcMain.handle('get-platform', async () => {
82-
return process.platform;
83-
});
84-
85-
ipcMain.handle('get-app-version', async () => {
86-
return app.getVersion();
89+
ipcMain.on('set-login-item-settings', (event, settings) => {
90+
app.setLoginItemSettings(settings);
8791
});
8892

8993
menubarApp.window.webContents.on('devtools-opened', () => {

src/utils/comms.test.ts

+5-11
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import {
77

88
const { ipcRenderer, shell } = require('electron');
99

10-
const remote = require('@electron/remote');
11-
1210
describe('utils/comms.ts', () => {
1311
beforeEach(function () {
1412
jest.spyOn(ipcRenderer, 'send');
@@ -45,24 +43,20 @@ describe('utils/comms.ts', () => {
4543
});
4644

4745
it('should setAutoLaunch (true)', () => {
48-
jest.spyOn(remote.app, 'setLoginItemSettings');
49-
5046
setAutoLaunch(true);
51-
expect(remote.app.setLoginItemSettings).toHaveBeenCalledTimes(1);
52-
expect(remote.app.setLoginItemSettings).toHaveBeenCalledWith({
47+
48+
expect(ipcRenderer.send).toHaveBeenCalledWith('set-login-item-settings', {
5349
openAtLogin: true,
5450
openAsHidden: true,
5551
});
5652
});
5753

5854
it('should setAutoLaunch (false)', () => {
59-
jest.spyOn(remote.app, 'setLoginItemSettings');
60-
6155
setAutoLaunch(false);
62-
expect(remote.app.setLoginItemSettings).toHaveBeenCalledTimes(1);
63-
expect(remote.app.setLoginItemSettings).toHaveBeenCalledWith({
64-
openAtLogin: false,
56+
57+
expect(ipcRenderer.send).toHaveBeenCalledWith('set-login-item-settings', {
6558
openAsHidden: false,
59+
openAtLogin: false,
6660
});
6761
});
6862
});

src/utils/comms.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
const { ipcRenderer, shell } = require('electron');
2-
const remote = require('@electron/remote');
32

43
export function openExternalLink(url: string): void {
54
shell.openExternal(url);
65
}
76

87
export function setAutoLaunch(value: boolean): void {
9-
remote.app.setLoginItemSettings({
8+
ipcRenderer.send('set-login-item-settings', {
109
openAtLogin: value,
1110
openAsHidden: value,
1211
});

0 commit comments

Comments
 (0)