diff --git a/js/blocked_number_controller.js b/js/blocked_number_controller.js index 295f09c91..e390961d2 100644 --- a/js/blocked_number_controller.js +++ b/js/blocked_number_controller.js @@ -47,29 +47,25 @@ // Make sure we don't block ourselves if (ourNumber === number) { window.log.info('BlockedNumberController: Cannot block yourself!'); - return null; + return; } storage.addBlockedNumber(number); // Make sure we don't add duplicates - const exists = blockedNumbers.getNumber(number); - if (exists) - return exists; + if (blockedNumbers.getNumber(number)) + return; - return blockedNumbers.add({ number }); + blockedNumbers.add({ number }); }, unblock(number) { storage.removeBlockedNumber(number); // Make sure we don't add duplicates - const exists = blockedNumbers.getNumber(number); - if (exists) { - blockedNumbers.remove(exists); - return exists; + const model = blockedNumbers.getNumber(number); + if (model) { + blockedNumbers.remove(model); } - - return null; }, unblockAll() { const all = blockedNumbers.models; diff --git a/preload.js b/preload.js index ebc8c6ceb..821d4ea8f 100644 --- a/preload.js +++ b/preload.js @@ -77,8 +77,9 @@ window.setMediaPermissions = enabled => ipc.send('set-media-permissions', enabled); window.getMediaPermissions = () => ipc.sendSync('get-media-permissions'); -// Events for updating block number states across different windows -// In this case we need these to update the blocked number collection on the main window from the settings window +// Events for updating block number states across different windows. +// In this case we need these to update the blocked number +// collection on the main window from the settings window. window.onUnblockNumber = number => ipc.send('on-unblock-number', number); ipc.on('on-unblock-number', (event, number) => { diff --git a/settings_preload.js b/settings_preload.js index 3db669400..55decf0b8 100644 --- a/settings_preload.js +++ b/settings_preload.js @@ -26,8 +26,9 @@ window.getAppInstance = () => config.appInstance; window.closeSettings = () => ipcRenderer.send('close-settings'); -// Events for updating block number states across different windows -// In this case we need these to update the blocked number collection on the main window from the settings window +// Events for updating block number states across different windows. +// In this case we need these to update the blocked number +// collection on the main window from the settings window. window.onUnblockNumber = number => ipcRenderer.send('on-unblock-number', number); window.getDeviceName = makeGetter('device-name');