From 29e281e4ed69565963472079d0d73135bd6b52cc Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 19 Oct 2017 14:04:55 -0300 Subject: [PATCH] Removes chrome-storage --- app-template/index-template.html | 8 --- src/app/app.component.ts | 4 +- src/providers/persistence/persistence.spec.ts | 1 - src/providers/persistence/persistence.ts | 3 +- .../persistence/storage/chrome-storage.ts | 58 ------------------- 5 files changed, 4 insertions(+), 70 deletions(-) delete mode 100644 src/providers/persistence/storage/chrome-storage.ts diff --git a/app-template/index-template.html b/app-template/index-template.html index 63f419eb3..689248c67 100644 --- a/app-template/index-template.html +++ b/app-template/index-template.html @@ -28,14 +28,6 @@ - -
- -
- diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d5eb311d3..79828b06b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -7,6 +7,7 @@ import { Logger } from '@nsalaun/ng-logger'; import { AppProvider } from '../providers/app/app'; import { ProfileProvider } from '../providers/profile/profile'; import { ConfigProvider } from '../providers/config/config'; +import { TouchIdProvider } from '../providers/touchid/touchid'; import { TabsPage } from '../pages/tabs/tabs'; import { OnboardingPage } from '../pages/onboarding/onboarding'; @@ -14,7 +15,8 @@ import { PinModalPage } from '../pages/pin/pin'; import { FingerprintModalPage } from '../pages/fingerprint/fingerprint'; @Component({ - templateUrl: 'app.html' + templateUrl: 'app.html', + providers: [TouchIdProvider] }) export class CopayApp { rootPage: any; diff --git a/src/providers/persistence/persistence.spec.ts b/src/providers/persistence/persistence.spec.ts index dbf073747..fdc9fe971 100644 --- a/src/providers/persistence/persistence.spec.ts +++ b/src/providers/persistence/persistence.spec.ts @@ -7,7 +7,6 @@ import { PersistenceProvider } from './persistence'; import { IStorage, ISTORAGE } from './storage/istorage'; import { RamStorage } from './storage/ram-storage'; import { LocalStorage } from './storage/local-storage'; -import { ChromeStorage } from './storage/chrome-storage'; import { FileStorage } from './storage/file-storage'; describe('Storage Service', () => { diff --git a/src/providers/persistence/persistence.ts b/src/providers/persistence/persistence.ts index 567d9b6b0..2368367ce 100644 --- a/src/providers/persistence/persistence.ts +++ b/src/providers/persistence/persistence.ts @@ -1,12 +1,11 @@ import { Injectable } from '@angular/core'; -import { InjectionToken, Inject } from '@angular/core'; +import { Inject } from '@angular/core'; import { Logger } from '@nsalaun/ng-logger'; import * as _ from 'lodash'; import { IStorage, ISTORAGE } from './storage/istorage'; import { PlatformProvider } from '../platform/platform'; import { LocalStorage } from './storage/local-storage'; -import { ChromeStorage } from './storage/chrome-storage'; import { FileStorage } from './storage/file-storage'; import { RamStorage } from './storage/ram-storage'; diff --git a/src/providers/persistence/storage/chrome-storage.ts b/src/providers/persistence/storage/chrome-storage.ts deleted file mode 100644 index ce0cf0d6a..000000000 --- a/src/providers/persistence/storage/chrome-storage.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; -import * as _ from 'lodash'; - -import { IStorage, KeyAlreadyExistsError } from './istorage'; - -@Injectable() -export class ChromeStorage implements IStorage { - ls: chrome.storage.StorageArea; - constructor(private log: Logger) { - let chrome: any; - if (!chrome.storage || !chrome.storage.local) throw new Error('Chrome storage not supported'); - this.ls = chrome.storage.local; - } - - get(k: string): Promise { - return new Promise(resolve => { - let v = this.ls.get(k, (v) => { - if (!v) return resolve(null); - if (!_.isString(v)) return resolve(v); - let parsed: any; - try { - parsed = JSON.parse(v); - } catch (e) { - } - resolve(parsed || v); - }); - }); - } - - set(k: string, v: any): Promise { - if (_.isObject(v)) { - v = JSON.stringify(v); - } - if (v && !_.isString(v)) { - v = v.toString(); - } - - let obj = {}; - obj[k] = v; - return new Promise(resolve => { - this.ls.set(obj, resolve); - }); - } - - remove(k: string): Promise { - return new Promise(resolve => { - this.ls.remove(k, resolve); - }); - } - - create(k: string, v: any): Promise { - return this.get(k).then((data) => { - if (data) throw new KeyAlreadyExistsError(); - this.set(k, v); - }); - } -}