From 6e060da237af35796b1b34dce108f05eef44ceb3 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 14 Apr 2023 14:16:08 -0300 Subject: some changes using transaction context from web utils alertContext.safely api change (easier to integrate) using lang and localstorage from web utils removing auto permission, from UI adding settings --- .../src/hooks/useAutoOpenPermissions.ts | 70 ------------------ .../taler-wallet-webextension/src/hooks/useLang.ts | 31 -------- .../src/hooks/useLocalStorage.ts | 83 ---------------------- .../src/hooks/useSettings.ts | 51 +++++++++++++ 4 files changed, 51 insertions(+), 184 deletions(-) delete mode 100644 packages/taler-wallet-webextension/src/hooks/useAutoOpenPermissions.ts delete mode 100644 packages/taler-wallet-webextension/src/hooks/useLang.ts delete mode 100644 packages/taler-wallet-webextension/src/hooks/useLocalStorage.ts create mode 100644 packages/taler-wallet-webextension/src/hooks/useSettings.ts (limited to 'packages/taler-wallet-webextension/src/hooks') diff --git a/packages/taler-wallet-webextension/src/hooks/useAutoOpenPermissions.ts b/packages/taler-wallet-webextension/src/hooks/useAutoOpenPermissions.ts deleted file mode 100644 index e0a34f690..000000000 --- a/packages/taler-wallet-webextension/src/hooks/useAutoOpenPermissions.ts +++ /dev/null @@ -1,70 +0,0 @@ -/* - This file is part of GNU Taler - (C) 2022 Taler Systems S.A. - - GNU Taler is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNU Taler; see the file COPYING. If not, see - */ - -import { useEffect, useState } from "preact/hooks"; -import { useAlertContext } from "../context/alert.js"; -import { useBackendContext } from "../context/backend.js"; -import { ToggleHandler } from "../mui/handlers.js"; -import { platform } from "../platform/foreground.js"; - -export function useAutoOpenPermissions(): ToggleHandler { - const api = useBackendContext(); - const { pushAlertOnError } = useAlertContext(); - const [enabled, setEnabled] = useState(false); - - async function handleAutoOpenPerm(): Promise { - if (!enabled) { - // We set permissions here, since apparently FF wants this to be done - // as the result of an input event ... - let granted: boolean; - try { - granted = await platform.getPermissionsApi().requestHostPermissions(); - } catch (lastError) { - setEnabled(false); - throw lastError; - } - const res = await api.background.call("toggleHeaderListener", granted); - setEnabled(res.newValue); - } else { - try { - await api.background - .call("toggleHeaderListener", false) - .then((r) => setEnabled(r.newValue)); - } catch (e) { - console.log(e); - } - } - return; - } - - useEffect(() => { - async function getValue(): Promise { - const res = await api.background.call( - "containsHeaderListener", - undefined, - ); - setEnabled(res.newValue); - } - getValue(); - }, []); - - return { - value: enabled, - button: { - onClick: pushAlertOnError(handleAutoOpenPerm), - }, - }; -} diff --git a/packages/taler-wallet-webextension/src/hooks/useLang.ts b/packages/taler-wallet-webextension/src/hooks/useLang.ts deleted file mode 100644 index b1aa40015..000000000 --- a/packages/taler-wallet-webextension/src/hooks/useLang.ts +++ /dev/null @@ -1,31 +0,0 @@ -/* - This file is part of GNU Taler - (C) 2022 Taler Systems S.A. - - GNU Taler is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNU Taler; see the file COPYING. If not, see - */ - -import { useNotNullLocalStorage } from "./useLocalStorage.js"; - -function getBrowserLang(): string | undefined { - if (typeof window === "undefined") return undefined; - if (window.navigator.languages) return window.navigator.languages[0]; - if (window.navigator.language) return window.navigator.language; - return undefined; -} - -export function useLang( - initial?: string, -): [string, (s: string) => void, boolean] { - const defaultLang = (getBrowserLang() || initial || "en").substring(0, 2); - return useNotNullLocalStorage("lang-preference", defaultLang); -} diff --git a/packages/taler-wallet-webextension/src/hooks/useLocalStorage.ts b/packages/taler-wallet-webextension/src/hooks/useLocalStorage.ts deleted file mode 100644 index 387798c96..000000000 --- a/packages/taler-wallet-webextension/src/hooks/useLocalStorage.ts +++ /dev/null @@ -1,83 +0,0 @@ -/* - This file is part of GNU Taler - (C) 2022 Taler Systems S.A. - - GNU Taler is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNU Taler; see the file COPYING. If not, see - */ - -/** - * - * @author Sebastian Javier Marchano (sebasjm) - */ - -import { StateUpdater, useState } from "preact/hooks"; - -export function useLocalStorage( - key: string, - initialValue?: string, -): [string | undefined, StateUpdater] { - const [storedValue, setStoredValue] = useState( - (): string | undefined => { - return typeof window !== "undefined" - ? window.localStorage.getItem(key) || initialValue - : initialValue; - }, - ); - - const setValue = ( - value?: string | ((val?: string) => string | undefined), - ): void => { - setStoredValue((p) => { - const toStore = value instanceof Function ? value(p) : value; - if (typeof window !== "undefined") { - if (!toStore) { - window.localStorage.removeItem(key); - } else { - window.localStorage.setItem(key, toStore); - } - } - return toStore; - }); - }; - - return [storedValue, setValue]; -} - -//TODO: merge with the above function -export function useNotNullLocalStorage( - key: string, - initialValue: string, -): [string, StateUpdater, boolean] { - const [storedValue, setStoredValue] = useState((): string => { - return typeof window !== "undefined" - ? window.localStorage.getItem(key) || initialValue - : initialValue; - }); - - const setValue = (value: string | ((val: string) => string)): void => { - const valueToStore = value instanceof Function ? value(storedValue) : value; - setStoredValue(valueToStore); - if (typeof window !== "undefined") { - if (!valueToStore) { - window.localStorage.removeItem(key); - } else { - window.localStorage.setItem(key, valueToStore); - } - } - }; - - const isSaved = - typeof window === "undefined" - ? false - : window.localStorage.getItem(key) !== null; - return [storedValue, setValue, isSaved]; -} diff --git a/packages/taler-wallet-webextension/src/hooks/useSettings.ts b/packages/taler-wallet-webextension/src/hooks/useSettings.ts new file mode 100644 index 000000000..04bce236a --- /dev/null +++ b/packages/taler-wallet-webextension/src/hooks/useSettings.ts @@ -0,0 +1,51 @@ +/* + This file is part of GNU Taler + (C) 2022 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +import { useLocalStorage } from "@gnu-taler/web-util/lib/index.browser"; + +interface Settings { + injectTalerSupport: boolean; +} + +const defaultSettings: Settings = { + injectTalerSupport: false, +}; + +function parse_json_or_undefined(str: string | undefined): T | undefined { + if (str === undefined) return undefined; + try { + return JSON.parse(str); + } catch { + return undefined; + } +} + +export function useSettings(): [ + Readonly, + (key: T, value: Settings[T]) => void, +] { + const { value, update } = useLocalStorage("wallet-settings"); + + const parsed: Settings = parse_json_or_undefined(value) ?? defaultSettings; + function updateField(k: T, v: Settings[T]) { + const newValue = { ...parsed, [k]: v }; + console.log("should update", k, v, parsed, newValue); + const json = JSON.stringify(newValue); + console.log(json); + update(json); + } + return [parsed, updateField]; +} -- cgit v1.2.3