From ab1a918326333437bc1afb72ed1d191d9b7475fa Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 29 Nov 2017 10:19:21 -0500
Subject: [PATCH] use utils for lock options settings

---
 src/popup/app/settings/settings.component.ts | 52 +++++++++-----------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/popup/app/settings/settings.component.ts b/src/popup/app/settings/settings.component.ts
index 588f73e764..7fd8e99394 100644
--- a/src/popup/app/settings/settings.component.ts
+++ b/src/popup/app/settings/settings.component.ts
@@ -32,10 +32,9 @@ export class SettingsController {
         }, 500);
 
         this.showOnLocked = !utilsService.isFirefox() && !utilsService.isEdge();
-
-        chrome.storage.local.get(constantsService.lockOptionKey, (obj: any) => {
-            if (obj && (obj[constantsService.lockOptionKey] || obj[constantsService.lockOptionKey] === 0)) {
-                let option = obj[constantsService.lockOptionKey].toString();
+        this.utilsService.getObjFromStorage(constantsService.lockOptionKey).then((lockOption: number) => {
+            if (lockOption != null) {
+                let option = lockOption.toString();
                 if (option === '-2' && !this.showOnLocked) {
                     option = '-1';
                 }
@@ -47,31 +46,26 @@ export class SettingsController {
     }
 
     changeLockOption() {
-        const obj: any = {};
-        obj[this.constantsService.lockOptionKey] = null;
-        if (this.lockOption && this.lockOption !== '') {
-            obj[this.constantsService.lockOptionKey] = parseInt(this.lockOption, 10);
-        }
-
-        chrome.storage.local.set(obj, () => {
-            this.cryptoService.getKeyHash().then((keyHash) => {
-                if (keyHash) {
-                    this.cryptoService.toggleKey();
-                } else {
-                    this.SweetAlert.swal({
-                        title: this.i18nService.loggingOut,
-                        text: this.i18nService.loggingOutConfirmation,
-                        showCancelButton: true,
-                        confirmButtonText: this.i18nService.yes,
-                        cancelButtonText: this.i18nService.cancel,
-                    }, (confirmed: boolean) => {
-                        if (confirmed) {
-                            this.cryptoService.toggleKey();
-                            chrome.runtime.sendMessage({ command: 'logout' });
-                        }
-                    });
-                }
-            });
+        const option = this.lockOption && this.lockOption !== '' ? parseInt(this.lockOption, 10) : null;
+        this.utilsService.saveObjToStorage(this.constantsService.lockOptionKey, option).then(() => {
+            return this.cryptoService.getKeyHash();
+        }).then((keyHash) => {
+            if (keyHash) {
+                this.cryptoService.toggleKey();
+            } else {
+                this.SweetAlert.swal({
+                    title: this.i18nService.loggingOut,
+                    text: this.i18nService.loggingOutConfirmation,
+                    showCancelButton: true,
+                    confirmButtonText: this.i18nService.yes,
+                    cancelButtonText: this.i18nService.cancel,
+                }, (confirmed: boolean) => {
+                    if (confirmed) {
+                        this.cryptoService.toggleKey();
+                        chrome.runtime.sendMessage({ command: 'logout' });
+                    }
+                });
+            }
         });
     }