octo/tooot
octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-02-01 19:16:56 +01:00
Code Issues Projects Releases Wiki Activity

Catch potentially json parsing error

Browse Source
This commit is contained in:
xmflsct 2023-02-01 00:07:38 +01:00
parent 5d3f773a2a
commit e60535cd1c
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Instance/index.tsx
View File

@ -186,7 +186,7 @@ const ComponentInstance: React.FC<Props> = ({
if (!account) { if (!account) {
setGlobalStorage('accounts', (accounts || []).concat([accountKey])) setGlobalStorage('accounts', (accounts || []).concat([accountKey]))
} }
setAccount(accountKey) await setAccount(accountKey)
goBack && navigation.goBack() goBack && navigation.goBack()
} }

8
src/utils/storage/actions.ts
View File

@ -33,9 +33,13 @@ export const getGlobalStorage = {
object: <T extends keyof StorageGlobal>(key: T) => { object: <T extends keyof StorageGlobal>(key: T) => {
const value = storage.global.getString(key) const value = storage.global.getString(key)
if (value?.length) { if (value?.length) {
try {
return JSON.parse(value) as NonNullable<StorageGlobal[T]> extends object return JSON.parse(value) as NonNullable<StorageGlobal[T]> extends object
? StorageGlobal[T] ? StorageGlobal[T]
: never : never
} catch {
return undefined
}
} else { } else {
return undefined return undefined
} }
@ -108,9 +112,13 @@ export const getAccountStorage = {
object: <T extends keyof StorageAccount>(key: T) => { object: <T extends keyof StorageAccount>(key: T) => {
const value = storage.account?.getString(key) const value = storage.account?.getString(key)
if (value?.length) { if (value?.length) {
try {
return JSON.parse(value) as NonNullable<StorageAccount[T]> extends object return JSON.parse(value) as NonNullable<StorageAccount[T]> extends object
? StorageAccount[T] ? StorageAccount[T]
: never : never
} catch {
return undefined
}
} else { } else {
return undefined return undefined
} }