From 1bb608b55a4a58295e5443e8bf9735df3f981e7c Mon Sep 17 00:00:00 2001 From: Mikunj Date: Tue, 20 Nov 2018 10:48:53 +1100 Subject: [PATCH] Fixed minor issues. --- js/blocked_number_controller.js | 132 ++++++++++++++++---------------- js/models/blockedNumbers.js | 2 +- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/js/blocked_number_controller.js b/js/blocked_number_controller.js index a098d535f..295f09c91 100644 --- a/js/blocked_number_controller.js +++ b/js/blocked_number_controller.js @@ -5,81 +5,81 @@ // eslint-disable-next-line func-names (function() { - 'use strict'; + 'use strict'; - window.Whisper = window.Whisper || {}; + window.Whisper = window.Whisper || {}; - const blockedNumbers = new Whisper.BlockedNumberCollection(); - window.getBlockedNumbers = () => blockedNumbers; + const blockedNumbers = new Whisper.BlockedNumberCollection(); + window.getBlockedNumbers = () => blockedNumbers; - window.BlockedNumberController = { - getAll() { - try { - this.load(); - } catch (e) { - console.warn(e); - } - return blockedNumbers; - }, - reset() { - blockedNumbers.reset([]); - }, - load() { - window.log.info('BlockedNumberController: starting initial fetch'); + window.BlockedNumberController = { + getAll() { + try { + this.load(); + } catch (e) { + window.log.warn(e); + } + return blockedNumbers; + }, + reset() { + blockedNumbers.reset([]); + }, + load() { + window.log.info('BlockedNumberController: starting initial fetch'); - if (blockedNumbers.length) { - throw new Error('BlockedNumberController: Already loaded!'); - } + if (blockedNumbers.length) { + throw new Error('BlockedNumberController: Already loaded!'); + } - if (!storage) { - throw new Error('BlockedNumberController: Could not load blocked numbers'); - } + if (!storage) { + throw new Error('BlockedNumberController: Could not load blocked numbers'); + } - // Add the numbers to the collection - const numbers = storage.getBlockedNumbers(); - blockedNumbers.add( - numbers.map(number => ({ number })) - ); - }, - block(number) { - const ourNumber = textsecure.storage.user.getNumber(); + // Add the numbers to the collection + const numbers = storage.getBlockedNumbers(); + blockedNumbers.add( + numbers.map(number => ({ number })) + ); + }, + block(number) { + const ourNumber = textsecure.storage.user.getNumber(); - // Make sure we don't block ourselves - if (ourNumber === number) { - window.log.info('BlockedNumberController: Cannot block yourself!'); - return null; - } + // Make sure we don't block ourselves + if (ourNumber === number) { + window.log.info('BlockedNumberController: Cannot block yourself!'); + return null; + } - storage.addBlockedNumber(number); + storage.addBlockedNumber(number); - // Make sure we don't add duplicates - const exists = blockedNumbers.getNumber(number); - if (exists) - return exists; + // Make sure we don't add duplicates + const exists = blockedNumbers.getNumber(number); + if (exists) + return exists; - return blockedNumbers.add({ number }); - }, - unblock(number) { - storage.removeBlockedNumber(number); + return 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; - } + // Make sure we don't add duplicates + const exists = blockedNumbers.getNumber(number); + if (exists) { + blockedNumbers.remove(exists); + return exists; + } - return null; - }, - unblockAll() { - const all = blockedNumbers.models; - all.forEach(number => { - storage.removeBlockedNumber(number); - blockedNumbers.remove(number); - }); - }, - isBlocked(number) { - return storage.isBlocked(number); - }, - }; - })(); \ No newline at end of file + return null; + }, + unblockAll() { + const all = blockedNumbers.models; + all.forEach(number => { + storage.removeBlockedNumber(number); + blockedNumbers.remove(number); + }); + }, + isBlocked(number) { + return storage.isBlocked(number); + }, + }; +})(); diff --git a/js/models/blockedNumbers.js b/js/models/blockedNumbers.js index b26a04290..6c8b5b113 100644 --- a/js/models/blockedNumbers.js +++ b/js/models/blockedNumbers.js @@ -90,4 +90,4 @@ }, }); -})(); \ No newline at end of file +})();